- {OS === "windows" && (
-
-
-
- )}
+ {OS === "windows" &&
}
diff --git a/clash-nyanpasu/frontend/nyanpasu/src/pages/connections.module.scss b/clash-nyanpasu/frontend/nyanpasu/src/pages/connections.module.scss
deleted file mode 100644
index d1e3e060fa..0000000000
--- a/clash-nyanpasu/frontend/nyanpasu/src/pages/connections.module.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.TopPanelPaper {
- @media screen and (width <= 1000px) {
- :global(.label) {
- display: none;
- }
-
- :global(.value) {
- padding-left: 8px;
- }
- }
-}
diff --git a/clash-nyanpasu/frontend/nyanpasu/src/pages/connections.module.scss.d.ts b/clash-nyanpasu/frontend/nyanpasu/src/pages/connections.module.scss.d.ts
deleted file mode 100644
index a1442180d3..0000000000
--- a/clash-nyanpasu/frontend/nyanpasu/src/pages/connections.module.scss.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare const classNames: {
- readonly TopPanelPaper: "TopPanelPaper";
- readonly label: "label";
- readonly value: "value";
-};
-export default classNames;
diff --git a/clash-nyanpasu/frontend/nyanpasu/src/pages/connections.tsx b/clash-nyanpasu/frontend/nyanpasu/src/pages/connections.tsx
index abef1f0ef2..751b597b46 100644
--- a/clash-nyanpasu/frontend/nyanpasu/src/pages/connections.tsx
+++ b/clash-nyanpasu/frontend/nyanpasu/src/pages/connections.tsx
@@ -1,275 +1,26 @@
-import { BaseEmpty, BasePage } from "@/components/base";
-import {
- ConnectionDetail,
- ConnectionDetailRef,
-} from "@/components/connection/connection-detail";
-import { ConnectionItem } from "@/components/connection/connection-item";
-import { ConnectionTable } from "@/components/connection/connection-table";
-import { useClashInfo } from "@/hooks/use-clash";
-import { useWebsocket } from "@/hooks/use-websocket";
-import { closeAllConnections } from "@/services/api";
-import { classNames } from "@/utils";
-import parseTraffic from "@/utils/parse-traffic";
-import {
- ArrowDownward,
- ArrowUpward,
- Link,
- TableChartRounded,
- TableRowsRounded,
-} from "@mui/icons-material";
-import {
- Box,
- Button,
- Grid,
- IconButton,
- MenuItem,
- Paper,
- Select,
- TextField,
- Typography,
-} from "@mui/material";
-import { useLockFn } from "ahooks";
-import { useEffect, useMemo, useRef, useState } from "react";
+import CloseConnectionsButton from "@/components/connections/close-connections-button";
+import ConnectionsTable from "@/components/connections/connections-table";
+import { BasePage } from "@nyanpasu/ui";
import { useTranslation } from "react-i18next";
-import { Virtuoso } from "react-virtuoso";
-import styles from "./connections.module.scss";
-import { useAtom } from "jotai";
-import { atomConnectionSetting } from "@/store";
-const initConn = { uploadTotal: 0, downloadTotal: 0, connections: [] };
-
-type OrderFunc = (list: IConnectionsItem[]) => IConnectionsItem[];
-
-export default function ConnectionsPage() {
- const { t, i18n } = useTranslation();
- const { clashInfo } = useClashInfo();
-
- const [filterText, setFilterText] = useState("");
- const [curOrderOpt, setOrderOpt] = useState("Default");
- const [connData, setConnData] = useState
(initConn);
-
- const [setting, setSetting] = useAtom(atomConnectionSetting);
-
- const isTableLayout = setting.layout === "table";
-
- const orderOpts: Record = {
- Default: (list) => list,
- "Upload Speed": (list) => list.sort((a, b) => b.curUpload! - a.curUpload!),
- "Download Speed": (list) =>
- list.sort((a, b) => b.curDownload! - a.curDownload!),
- };
-
- const uploadTotal = connData.uploadTotal;
-
- const downloadTotal = connData.downloadTotal;
-
- const filterConn = useMemo(() => {
- const orderFunc = orderOpts[curOrderOpt];
- const connections = connData.connections.filter(
- (conn) =>
- (conn.metadata.host || conn.metadata.destinationIP)?.includes(
- filterText,
- ) ||
- (conn.metadata.process || conn.metadata.processPath)
- ?.toLowerCase()
- .includes(filterText.toLowerCase()),
- );
-
- if (orderFunc) return orderFunc(connections);
- return connections;
- }, [connData, filterText, curOrderOpt]);
-
- const { connect, disconnect } = useWebsocket(
- (event) => {
- // meta v1.15.0 出现data.connections为null的情况
- const data = JSON.parse(event.data) as IConnections;
- // 尽量与前一次connections的展示顺序保持一致
- setConnData((old) => {
- const oldConn = old.connections;
- const maxLen = data.connections?.length;
-
- const connections: typeof oldConn = [];
-
- const rest = data.connections?.filter((each) => {
- const index = oldConn.findIndex((o) => o.id === each.id);
-
- if (index >= 0 && index < maxLen) {
- const old = oldConn[index];
- each.curUpload = each.upload - old.upload;
- each.curDownload = each.download - old.download;
-
- connections[index] = each;
- return false;
- }
- return true;
- });
-
- for (let i = 0; i < maxLen; ++i) {
- if (!connections[i] && rest.length > 0) {
- connections[i] = rest.shift()!;
- connections[i].curUpload = 0;
- connections[i].curDownload = 0;
- }
- }
-
- return { ...data, connections };
- });
- },
- { errorCount: 3, retryInterval: 1000 },
- );
-
- useEffect(() => {
- if (!clashInfo) return;
-
- const { server = "", secret = "" } = clashInfo;
- connect(`ws://${server}/connections?token=${encodeURIComponent(secret)}`);
-
- return () => {
- disconnect();
- };
- }, [clashInfo]);
-
- const onCloseAll = useLockFn(closeAllConnections);
-
- const detailRef = useRef(null!);
-
- const connectionItems = [
- {
- icon: ,
- label: t("Upload Total"),
- value: parseTraffic(uploadTotal).join(" "),
- },
- {
- icon: ,
- label: t("Download Total"),
- value: parseTraffic(downloadTotal).join(" "),
- },
- {
- icon: ,
- label: t("Active Connections"),
- value: filterConn.length,
- },
- ];
+export const Connections = () => {
+ const { t } = useTranslation();
return (
-
- setSetting((o) =>
- o.layout === "list"
- ? { ...o, layout: "table" }
- : { ...o, layout: "list" },
- )
- }
- >
- {isTableLayout ? (
-
- ) : (
-
- )}
-
-
-
-
+
}
>
-
-
- {connectionItems.map((item, index) => (
-
-
- {item.icon}
-
- {item.label}
-
+
- {item.value}
-
-
- ))}
-
-
-
-
-
- {!isTableLayout && (
-
- )}
-
- setFilterText(e.target.value)}
- sx={{ input: { py: 0.65, px: 1.25 } }}
- />
-
-
-
- {filterConn.length === 0 ? (
-
- ) : isTableLayout ? (
- detailRef.current?.open(detail)}
- />
- ) : (
- (
- detailRef.current?.open(item)}
- />
- )}
- />
- )}
-
-
-
-
+
);
-}
+};
+
+export default Connections;
diff --git a/clash-nyanpasu/frontend/nyanpasu/src/pages/rules.tsx b/clash-nyanpasu/frontend/nyanpasu/src/pages/rules.tsx
index 462e99e9d7..7f83f6cd3c 100644
--- a/clash-nyanpasu/frontend/nyanpasu/src/pages/rules.tsx
+++ b/clash-nyanpasu/frontend/nyanpasu/src/pages/rules.tsx
@@ -1,73 +1,68 @@
-import { BaseEmpty, BasePage } from "@/components/base";
-import RuleItem from "@/components/rule/rule-item";
-import { getRules } from "@/services/api";
-import { Box, Paper, TextField } from "@mui/material";
+import { BaseEmpty } from "@/components/base";
+import RuleItem from "@/components/rules/rule-item";
+import { alpha, FilledInputProps, TextField, useTheme } from "@mui/material";
+import { useClashCore } from "@nyanpasu/interface";
+import { BasePage } from "@nyanpasu/ui";
import { useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
-import { Virtuoso } from "react-virtuoso";
-import useSWR from "swr";
+import { VList } from "virtua";
export default function RulesPage() {
const { t } = useTranslation();
- const { data = [] } = useSWR("getRules", getRules);
+
+ const { palette } = useTheme();
+
+ const { getRules } = useClashCore();
const [filterText, setFilterText] = useState("");
const rules = useMemo(() => {
- return data.filter((each) => each.payload.includes(filterText));
- }, [data, filterText]);
+ return getRules.data?.rules.filter((each) =>
+ each.payload.includes(filterText),
+ );
+ }, [getRules.data, filterText]);
+
+ const inputProps: Partial = {
+ sx: {
+ borderRadius: 7,
+ backgroundColor: alpha(palette.primary.main, 0.1),
+ backdropFilter: "blur(8px)",
+
+ fieldset: {
+ border: "none",
+ },
+ },
+ };
return (
-
-
- setFilterText(e.target.value)}
- sx={{ input: { py: 0.65, px: 1.25 } }}
- InputProps={{
- sx: {
- borderRadius: 4,
- },
- }}
- />
-
-
+
+ setFilterText(e.target.value)}
+ sx={{ input: { py: 1, px: 2 } }}
+ InputProps={inputProps}
+ />
+
-
- {rules.length > 0 ? (
- (
-
- )}
- followOutput={"smooth"}
- overscan={900}
- />
+
+ {rules ? (
+ <>
+
+
+ {rules.map((item, index) => {
+ return ;
+ })}
+
) : (
)}
-
+
);
}
diff --git a/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss b/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss
index d91a387552..b5d0e8fa1a 100644
--- a/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss
+++ b/clash-nyanpasu/frontend/ui/materialYou/components/basePage/style.scss
@@ -7,10 +7,11 @@
> header {
box-sizing: border-box;
display: flex;
- flex: 0 0 64px;
- align-items: center;
+ align-items: end;
justify-content: space-between;
width: 100%;
+ height: 72px;
+ padding-bottom: 12px;
margin: 0 auto;
}
diff --git a/clash-nyanpasu/frontend/ui/package.json b/clash-nyanpasu/frontend/ui/package.json
index b491a1b5e4..9e475c764b 100644
--- a/clash-nyanpasu/frontend/ui/package.json
+++ b/clash-nyanpasu/frontend/ui/package.json
@@ -10,7 +10,7 @@
"@mui/material": "5.15.19",
"@types/react": "18.3.3",
"ahooks": "3.8.0",
- "framer-motion": "11.2.9",
+ "framer-motion": "11.2.10",
"react": "18.3.1",
"react-error-boundary": "4.0.13",
"react-i18next": "14.1.2"
diff --git a/clash-nyanpasu/manifest/version.json b/clash-nyanpasu/manifest/version.json
index d5c7c7e344..e187877e73 100644
--- a/clash-nyanpasu/manifest/version.json
+++ b/clash-nyanpasu/manifest/version.json
@@ -2,8 +2,8 @@
"manifest_version": 1,
"latest": {
"mihomo": "v1.18.5",
- "mihomo_alpha": "alpha-d3fea90",
- "clash_rs": "v0.1.17",
+ "mihomo_alpha": "alpha-063836f",
+ "clash_rs": "v0.1.18",
"clash_premium": "2023-09-05-gdcc8d87"
},
"arch_template": {
@@ -36,5 +36,5 @@
"darwin-x64": "clash-darwin-amd64-n{}.gz"
}
},
- "updated_at": "2024-05-30T22:20:05.828Z"
+ "updated_at": "2024-06-05T22:20:11.986Z"
}
diff --git a/clash-nyanpasu/package.json b/clash-nyanpasu/package.json
index 64f5368649..6c24c935aa 100644
--- a/clash-nyanpasu/package.json
+++ b/clash-nyanpasu/package.json
@@ -74,7 +74,7 @@
"@tauri-apps/cli": "1.5.14",
"@types/fs-extra": "11.0.4",
"@types/lodash-es": "4.17.12",
- "@types/node": "20.12.13",
+ "@types/node": "20.14.2",
"autoprefixer": "10.4.19",
"conventional-changelog-conventionalcommits": "8.0.0",
"cross-env": "7.0.3",
@@ -95,7 +95,7 @@
"postcss-html": "1.7.0",
"postcss-import": "16.1.0",
"postcss-scss": "4.0.9",
- "prettier": "3.2.5",
+ "prettier": "3.3.1",
"prettier-plugin-toml": "2.0.1",
"react-devtools": "5.2.0",
"stylelint": "16.6.1",
@@ -104,12 +104,12 @@
"stylelint-config-standard": "36.0.0",
"stylelint-declaration-block-no-ignored-properties": "2.8.0",
"stylelint-order": "6.0.4",
- "stylelint-scss": "6.3.0",
- "tailwindcss": "3.4.3",
- "tsx": "4.11.0",
+ "stylelint-scss": "6.3.1",
+ "tailwindcss": "3.4.4",
+ "tsx": "4.12.0",
"typescript": "5.4.5"
},
- "packageManager": "pnpm@9.1.4",
+ "packageManager": "pnpm@9.2.0",
"engines": {
"node": "22.2.0"
},
diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml
index 7a821a65bb..cdd6573ccb 100644
--- a/clash-nyanpasu/pnpm-lock.yaml
+++ b/clash-nyanpasu/pnpm-lock.yaml
@@ -24,7 +24,7 @@ importers:
devDependencies:
'@commitlint/cli':
specifier: 19.3.0
- version: 19.3.0(@types/node@20.12.13)(typescript@5.4.5)
+ version: 19.3.0(@types/node@20.14.2)(typescript@5.4.5)
'@commitlint/config-conventional':
specifier: 19.2.2
version: 19.2.2
@@ -38,8 +38,8 @@ importers:
specifier: 4.17.12
version: 4.17.12
'@types/node':
- specifier: 20.12.13
- version: 20.12.13
+ specifier: 20.14.2
+ version: 20.14.2
autoprefixer:
specifier: 10.4.19
version: 10.4.19(postcss@8.4.38)
@@ -75,7 +75,7 @@ importers:
version: 16.6.2(eslint@8.57.0)
eslint-plugin-prettier:
specifier: 5.1.3
- version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5)
+ version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.1)
eslint-plugin-promise:
specifier: 6.2.0
version: 6.2.0(eslint@8.57.0)
@@ -101,11 +101,11 @@ importers:
specifier: 4.0.9
version: 4.0.9(postcss@8.4.38)
prettier:
- specifier: 3.2.5
- version: 3.2.5
+ specifier: 3.3.1
+ version: 3.3.1
prettier-plugin-toml:
specifier: 2.0.1
- version: 2.0.1(prettier@3.2.5)
+ version: 2.0.1(prettier@3.3.1)
react-devtools:
specifier: 5.2.0
version: 5.2.0(bufferutil@4.0.8)(utf-8-validate@5.0.10)
@@ -128,14 +128,14 @@ importers:
specifier: 6.0.4
version: 6.0.4(stylelint@16.6.1(typescript@5.4.5))
stylelint-scss:
- specifier: 6.3.0
- version: 6.3.0(stylelint@16.6.1(typescript@5.4.5))
+ specifier: 6.3.1
+ version: 6.3.1(stylelint@16.6.1(typescript@5.4.5))
tailwindcss:
- specifier: 3.4.3
- version: 3.4.3
+ specifier: 3.4.4
+ version: 3.4.4
tsx:
- specifier: 4.11.0
- version: 4.11.0
+ specifier: 4.12.0
+ version: 4.12.0
typescript:
specifier: 5.4.5
version: 5.4.5
@@ -145,6 +145,9 @@ importers:
'@tauri-apps/api':
specifier: 1.5.6
version: 1.5.6
+ ahooks:
+ specifier: 3.8.0
+ version: 3.8.0(react@19.0.0-rc-9d4fba0788-20240530)
ofetch:
specifier: 1.3.4
version: 1.3.4
@@ -175,7 +178,7 @@ importers:
version: 11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
'@generouted/react-router':
specifier: 1.19.5
- version: 1.19.5(react-router-dom@6.23.1(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
+ version: 1.19.5(react-router-dom@6.23.1(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
'@juggle/resize-observer':
specifier: 3.4.0
version: 3.4.0
@@ -184,7 +187,7 @@ importers:
version: 0.2.7
'@mui/icons-material':
specifier: 5.15.19
- version: 5.15.19(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
+ version: 5.15.19(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
'@mui/lab':
specifier: 5.0.0-alpha.170
version: 5.0.0-alpha.170(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
@@ -192,8 +195,8 @@ importers:
specifier: 5.15.19
version: 5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
'@mui/x-data-grid':
- specifier: 7.6.0
- version: 7.6.0(@babel/core@7.24.5)(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(bufferutil@4.0.8)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)(utf-8-validate@5.0.10)
+ specifier: 7.6.2
+ version: 7.6.2(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
'@nyanpasu/interface':
specifier: workspace:^
version: link:../interface
@@ -216,14 +219,14 @@ importers:
specifier: 1.11.11
version: 1.11.11
framer-motion:
- specifier: 11.2.9
- version: 11.2.9(@emotion/is-prop-valid@1.2.2)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)
+ specifier: 11.2.10
+ version: 11.2.10(@emotion/is-prop-valid@1.2.2)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)
i18next:
specifier: 23.11.5
version: 23.11.5
jotai:
- specifier: 2.8.2
- version: 2.8.2(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
+ specifier: 2.8.3
+ version: 2.8.3(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
monaco-editor:
specifier: 0.49.0
version: 0.49.0
@@ -289,35 +292,35 @@ importers:
specifier: 4.4.10
version: 4.4.10
'@typescript-eslint/eslint-plugin':
- specifier: 7.11.0
- version: 7.11.0(@typescript-eslint/parser@7.11.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)
+ specifier: 7.12.0
+ version: 7.12.0(@typescript-eslint/parser@7.12.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)
'@typescript-eslint/parser':
- specifier: 7.11.0
- version: 7.11.0(eslint@8.57.0)(typescript@5.4.5)
+ specifier: 7.12.0
+ version: 7.12.0(eslint@8.57.0)(typescript@5.4.5)
'@vitejs/plugin-react':
specifier: 4.3.0
- version: 4.3.0(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
+ version: 4.3.0(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
sass:
specifier: 1.77.4
version: 1.77.4
shiki:
- specifier: 1.6.1
- version: 1.6.1
+ specifier: 1.6.2
+ version: 1.6.2
vite:
specifier: 5.2.12
- version: 5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
+ version: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
vite-plugin-monaco-editor:
specifier: npm:vite-plugin-monaco-editor-new@1.1.3
version: vite-plugin-monaco-editor-new@1.1.3(monaco-editor@0.49.0)
vite-plugin-sass-dts:
specifier: 1.3.22
- version: 1.3.22(postcss@8.4.38)(prettier@3.2.5)(sass@1.77.4)(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
+ version: 1.3.22(postcss@8.4.38)(prettier@3.3.1)(sass@1.77.4)(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
vite-plugin-svgr:
specifier: 4.2.0
- version: 4.2.0(rollup@4.17.2)(typescript@5.4.5)(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
+ version: 4.2.0(rollup@4.17.2)(typescript@5.4.5)(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
vite-tsconfig-paths:
specifier: 4.3.2
- version: 4.3.2(typescript@5.4.5)(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
+ version: 4.3.2(typescript@5.4.5)(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
frontend/ui:
dependencies:
@@ -326,7 +329,7 @@ importers:
version: 0.2.7
'@mui/icons-material':
specifier: 5.15.19
- version: 5.15.19(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
+ version: 5.15.19(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
'@mui/lab':
specifier: 5.0.0-alpha.170
version: 5.0.0-alpha.170(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
@@ -340,8 +343,8 @@ importers:
specifier: 3.8.0
version: 3.8.0(react@19.0.0-rc-9d4fba0788-20240530)
framer-motion:
- specifier: 11.2.9
- version: 11.2.9(@emotion/is-prop-valid@1.2.2)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)
+ specifier: 11.2.10
+ version: 11.2.10(@emotion/is-prop-valid@1.2.2)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)
react:
specifier: npm:react@rc
version: 19.0.0-rc-9d4fba0788-20240530
@@ -375,8 +378,8 @@ importers:
specifier: 0.5.5
version: 0.5.5
adm-zip:
- specifier: 0.5.12
- version: 0.5.12
+ specifier: 0.5.14
+ version: 0.5.14
colorize-template:
specifier: 1.0.0
version: 1.0.0
@@ -396,8 +399,8 @@ importers:
specifier: 1.0.1
version: 1.0.1
telegram:
- specifier: 2.21.2
- version: 2.21.2
+ specifier: 2.22.2
+ version: 2.22.2
packages:
@@ -422,10 +425,6 @@ packages:
resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==}
engines: {node: '>=6.9.0'}
- '@babel/code-frame@7.24.6':
- resolution: {integrity: sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==}
- engines: {node: '>=6.9.0'}
-
'@babel/compat-data@7.24.4':
resolution: {integrity: sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==}
engines: {node: '>=6.9.0'}
@@ -438,126 +437,56 @@ packages:
resolution: {integrity: sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==}
engines: {node: '>=6.9.0'}
- '@babel/helper-annotate-as-pure@7.24.6':
- resolution: {integrity: sha512-DitEzDfOMnd13kZnDqns1ccmftwJTS9DMkyn9pYTxulS7bZxUxpMly3Nf23QQ6NwA4UB8lAqjbqWtyvElEMAkg==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-compilation-targets@7.23.6':
resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==}
engines: {node: '>=6.9.0'}
- '@babel/helper-create-class-features-plugin@7.24.6':
- resolution: {integrity: sha512-djsosdPJVZE6Vsw3kk7IPRWethP94WHGOhQTc67SNXE0ZzMhHgALw8iGmYS0TD1bbMM0VDROy43od7/hN6WYcA==}
- engines: {node: '>=6.9.0'}
- peerDependencies:
- '@babel/core': ^7.0.0
-
'@babel/helper-environment-visitor@7.22.20':
resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
engines: {node: '>=6.9.0'}
- '@babel/helper-environment-visitor@7.24.6':
- resolution: {integrity: sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-function-name@7.23.0':
resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==}
engines: {node: '>=6.9.0'}
- '@babel/helper-function-name@7.24.6':
- resolution: {integrity: sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-hoist-variables@7.22.5':
resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
engines: {node: '>=6.9.0'}
- '@babel/helper-member-expression-to-functions@7.24.6':
- resolution: {integrity: sha512-OTsCufZTxDUsv2/eDXanw/mUZHWOxSbEmC3pP8cgjcy5rgeVPWWMStnv274DV60JtHxTk0adT0QrCzC4M9NWGg==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-module-imports@7.24.3':
resolution: {integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==}
engines: {node: '>=6.9.0'}
- '@babel/helper-module-imports@7.24.6':
- resolution: {integrity: sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-module-transforms@7.24.5':
resolution: {integrity: sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.0.0
- '@babel/helper-module-transforms@7.24.6':
- resolution: {integrity: sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==}
- engines: {node: '>=6.9.0'}
- peerDependencies:
- '@babel/core': ^7.0.0
-
- '@babel/helper-optimise-call-expression@7.24.6':
- resolution: {integrity: sha512-3SFDJRbx7KuPRl8XDUr8O7GAEB8iGyWPjLKJh/ywP/Iy9WOmEfMrsWbaZpvBu2HSYn4KQygIsz0O7m8y10ncMA==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-plugin-utils@7.24.5':
resolution: {integrity: sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==}
engines: {node: '>=6.9.0'}
- '@babel/helper-plugin-utils@7.24.6':
- resolution: {integrity: sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg==}
- engines: {node: '>=6.9.0'}
-
- '@babel/helper-replace-supers@7.24.6':
- resolution: {integrity: sha512-mRhfPwDqDpba8o1F8ESxsEkJMQkUF8ZIWrAc0FtWhxnjfextxMWxr22RtFizxxSYLjVHDeMgVsRq8BBZR2ikJQ==}
- engines: {node: '>=6.9.0'}
- peerDependencies:
- '@babel/core': ^7.0.0
-
'@babel/helper-simple-access@7.24.5':
resolution: {integrity: sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==}
engines: {node: '>=6.9.0'}
- '@babel/helper-simple-access@7.24.6':
- resolution: {integrity: sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==}
- engines: {node: '>=6.9.0'}
-
- '@babel/helper-skip-transparent-expression-wrappers@7.24.6':
- resolution: {integrity: sha512-jhbbkK3IUKc4T43WadP96a27oYti9gEf1LdyGSP2rHGH77kwLwfhO7TgwnWvxxQVmke0ImmCSS47vcuxEMGD3Q==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-split-export-declaration@7.24.5':
resolution: {integrity: sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==}
engines: {node: '>=6.9.0'}
- '@babel/helper-split-export-declaration@7.24.6':
- resolution: {integrity: sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-string-parser@7.24.1':
resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==}
engines: {node: '>=6.9.0'}
- '@babel/helper-string-parser@7.24.6':
- resolution: {integrity: sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-validator-identifier@7.24.5':
resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==}
engines: {node: '>=6.9.0'}
- '@babel/helper-validator-identifier@7.24.6':
- resolution: {integrity: sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==}
- engines: {node: '>=6.9.0'}
-
'@babel/helper-validator-option@7.23.5':
resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
engines: {node: '>=6.9.0'}
- '@babel/helper-validator-option@7.24.6':
- resolution: {integrity: sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==}
- engines: {node: '>=6.9.0'}
-
'@babel/helpers@7.24.5':
resolution: {integrity: sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==}
engines: {node: '>=6.9.0'}
@@ -566,38 +495,11 @@ packages:
resolution: {integrity: sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==}
engines: {node: '>=6.9.0'}
- '@babel/highlight@7.24.6':
- resolution: {integrity: sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==}
- engines: {node: '>=6.9.0'}
-
'@babel/parser@7.24.5':
resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==}
engines: {node: '>=6.0.0'}
hasBin: true
- '@babel/parser@7.24.6':
- resolution: {integrity: sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==}
- engines: {node: '>=6.0.0'}
- hasBin: true
-
- '@babel/plugin-syntax-jsx@7.24.6':
- resolution: {integrity: sha512-lWfvAIFNWMlCsU0DRUun2GpFwZdGTukLaHJqRh1JRb80NdAP5Sb1HDHB5X9P9OtgZHQl089UzQkpYlBq2VTPRw==}
- engines: {node: '>=6.9.0'}
- peerDependencies:
- '@babel/core': ^7.0.0-0
-
- '@babel/plugin-syntax-typescript@7.24.6':
- resolution: {integrity: sha512-TzCtxGgVTEJWWwcYwQhCIQ6WaKlo80/B+Onsk4RRCcYqpYGFcG9etPW94VToGte5AAcxRrhjPUFvUS3Y2qKi4A==}
- engines: {node: '>=6.9.0'}
- peerDependencies:
- '@babel/core': ^7.0.0-0
-
- '@babel/plugin-transform-modules-commonjs@7.24.6':
- resolution: {integrity: sha512-JEV8l3MHdmmdb7S7Cmx6rbNEjRCgTQMZxllveHO0mx6uiclB0NflCawlQQ6+o5ZrwjUBYPzHm2XoK4wqGVUFuw==}
- engines: {node: '>=6.9.0'}
- peerDependencies:
- '@babel/core': ^7.0.0-0
-
'@babel/plugin-transform-react-jsx-self@7.24.5':
resolution: {integrity: sha512-RtCJoUO2oYrYwFPtR1/jkoBEcFuI1ae9a9IMxeyAVa3a1Ap4AnxmyIKG2b2FaJKqkidw/0cxRbWN+HOs6ZWd1w==}
engines: {node: '>=6.9.0'}
@@ -610,24 +512,6 @@ packages:
peerDependencies:
'@babel/core': ^7.0.0-0
- '@babel/plugin-transform-typescript@7.24.6':
- resolution: {integrity: sha512-H0i+hDLmaYYSt6KU9cZE0gb3Cbssa/oxWis7PX4ofQzbvsfix9Lbh8SRk7LCPDlLWJHUiFeHU0qRRpF/4Zv7mQ==}
- engines: {node: '>=6.9.0'}
- peerDependencies:
- '@babel/core': ^7.0.0-0
-
- '@babel/preset-typescript@7.24.6':
- resolution: {integrity: sha512-U10aHPDnokCFRXgyT/MaIRTivUu2K/mu0vJlwRS9LxJmJet+PFQNKpggPyFCUtC6zWSBPjvxjnpNkAn3Uw2m5w==}
- engines: {node: '>=6.9.0'}
- peerDependencies:
- '@babel/core': ^7.0.0-0
-
- '@babel/register@7.24.6':
- resolution: {integrity: sha512-WSuFCc2wCqMeXkz/i3yfAAsxwWflEgbVkZzivgAmXl/MxrXeoYFZOOPllbC8R8WTF7u61wSRQtDVZ1879cdu6w==}
- engines: {node: '>=6.9.0'}
- peerDependencies:
- '@babel/core': ^7.0.0-0
-
'@babel/runtime@7.24.5':
resolution: {integrity: sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==}
engines: {node: '>=6.9.0'}
@@ -640,10 +524,6 @@ packages:
resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==}
engines: {node: '>=6.9.0'}
- '@babel/template@7.24.6':
- resolution: {integrity: sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==}
- engines: {node: '>=6.9.0'}
-
'@babel/traverse@7.24.5':
resolution: {integrity: sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==}
engines: {node: '>=6.9.0'}
@@ -652,10 +532,6 @@ packages:
resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==}
engines: {node: '>=6.9.0'}
- '@babel/types@7.24.6':
- resolution: {integrity: sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==}
- engines: {node: '>=6.9.0'}
-
'@commitlint/cli@19.3.0':
resolution: {integrity: sha512-LgYWOwuDR7BSTQ9OLZ12m7F/qhNY+NpAyPBgo4YNMkACE7lGuUnuQq1yi9hz1KA4+3VqpOYl8H1rY/LYK43v7g==}
engines: {node: '>=v18'}
@@ -1197,13 +1073,6 @@ packages:
'@material/material-color-utilities@0.2.7':
resolution: {integrity: sha512-0FCeqG6WvK4/Cc06F/xXMd/pv4FeisI0c1tUpBbfhA2n9Y8eZEv4Karjbmf2ZqQCPUWMrGp8A571tCjizxoTiQ==}
- '@mnajdova/enzyme-adapter-react-18@0.2.0':
- resolution: {integrity: sha512-BOnjlVa7FHI1YUnYe+FdUtQu6szI1wLJ+C1lHyqmF3T9gu/J/WCYqqcD44dPkrU+8eYvvk/gQducsqna4HFiAg==}
- peerDependencies:
- enzyme: ^3.0.0
- react: npm:react@rc
- react-dom: npm:react-dom@rc
-
'@mui/base@5.0.0-beta.40':
resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==}
engines: {node: '>=12.0.0'}
@@ -1229,12 +1098,6 @@ packages:
'@types/react':
optional: true
- '@mui/internal-test-utils@1.0.0-dev.20240529-082515-213b5e33ab':
- resolution: {integrity: sha512-4TEDRwZvsTDRpyBLSubiMh1W+UgK4YZ8kRDEp7zWeEKEugr1lOji/fE8yeaWKtJVMKwEW8cTH0QtSlRn3oDzaw==}
- peerDependencies:
- react: npm:react@rc
- react-dom: npm:react-dom@rc
-
'@mui/lab@5.0.0-alpha.170':
resolution: {integrity: sha512-0bDVECGmrNjd3+bLdcLiwYZ0O4HP5j5WSQm5DV6iA/Z9kr8O6AnvZ1bv9ImQbbX7Gj3pX4o43EKwCutj3EQxQg==}
engines: {node: '>=12.0.0'}
@@ -1327,8 +1190,8 @@ packages:
'@types/react':
optional: true
- '@mui/x-data-grid@7.6.0':
- resolution: {integrity: sha512-sMtnORdTRkLy+oQ3vkWaQ5c7yUdd6ovdgy3UGsn+QNqbA2hgLafFweH53nKMtNS+aULrJ1p5kCwK+DhqIYVrsA==}
+ '@mui/x-data-grid@7.6.2':
+ resolution: {integrity: sha512-f3t6TU8+f0VgmL4aJ9N/Wm5IeWfICfVb45S469wzzldUhbb/beIO/T3uMyGP13WFhx5f8N5wRRHSYZRHpfzhZw==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@mui/material': ^5.15.14
@@ -1499,31 +1362,13 @@ packages:
cpu: [x64]
os: [win32]
- '@shikijs/core@1.6.1':
- resolution: {integrity: sha512-CqYyepN4SnBopaoXYwng4NO8riB5ask/LTCkhOFq+GNGtr2X+aKeD767eYdqYukeixEUvv4bXdyTYVaogj7KBw==}
+ '@shikijs/core@1.6.2':
+ resolution: {integrity: sha512-guW5JeDzZ7uwOjTfCOFZ2VtVXk5tmkMzBYbKGfXsmAH1qYOej49L5jQDcGmwd6/OgvpmWhzO2GNJkQIFnbwLPQ==}
'@sindresorhus/is@4.6.0':
resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
engines: {node: '>=10'}
- '@sinonjs/commons@2.0.0':
- resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
-
- '@sinonjs/commons@3.0.1':
- resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==}
-
- '@sinonjs/fake-timers@10.3.0':
- resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==}
-
- '@sinonjs/fake-timers@11.2.2':
- resolution: {integrity: sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==}
-
- '@sinonjs/samsam@8.0.0':
- resolution: {integrity: sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==}
-
- '@sinonjs/text-encoding@0.7.2':
- resolution: {integrity: sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==}
-
'@svgr/babel-plugin-add-jsx-attribute@8.0.0':
resolution: {integrity: sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==}
engines: {node: '>=14'}
@@ -1671,27 +1516,9 @@ packages:
engines: {node: '>= 10'}
hasBin: true
- '@testing-library/dom@10.1.0':
- resolution: {integrity: sha512-wdsYKy5zupPyLCW2Je5DLHSxSfbIp6h80WoHOQc+RPtmPGA52O9x5MJEkv92Sjonpq+poOAtUKhh1kBGAXBrNA==}
- engines: {node: '>=18'}
-
- '@testing-library/react@15.0.7':
- resolution: {integrity: sha512-cg0RvEdD1TIhhkm1IeYMQxrzy0MtUNfa3minv4MjbgcYzJAZ7yD0i0lwoPOTPr+INtiXFezt2o8xMSnyHhEn2Q==}
- engines: {node: '>=18'}
- peerDependencies:
- '@types/react': npm:types-react@rc
- react: npm:react@rc
- react-dom: npm:react-dom@rc
- peerDependenciesMeta:
- '@types/react':
- optional: true
-
'@types/adm-zip@0.5.5':
resolution: {integrity: sha512-YCGstVMjc4LTY5uK9/obvxBya93axZOVOyf2GSUulADzmLhYE45u2nAssCs/fWBs1Ifq5Vat75JTPwd5XZoPJw==}
- '@types/aria-query@5.0.4':
- resolution: {integrity: sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==}
-
'@types/babel__core@7.20.5':
resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
@@ -1761,8 +1588,8 @@ packages:
'@types/node@20.12.10':
resolution: {integrity: sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw==}
- '@types/node@20.12.13':
- resolution: {integrity: sha512-gBGeanV41c1L171rR7wjbMiEpEI/l5XFQdLLfhr/REwpgDy/4U8y89+i8kRiLzDyZdOkXh+cRaTetUnCYutoXA==}
+ '@types/node@20.14.2':
+ resolution: {integrity: sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==}
'@types/parse-json@4.0.2':
resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
@@ -1791,8 +1618,8 @@ packages:
'@types/yauzl@2.10.3':
resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
- '@typescript-eslint/eslint-plugin@7.11.0':
- resolution: {integrity: sha512-P+qEahbgeHW4JQ/87FuItjBj8O3MYv5gELDzr8QaQ7fsll1gSMTYb6j87MYyxwf3DtD7uGFB9ShwgmCJB5KmaQ==}
+ '@typescript-eslint/eslint-plugin@7.12.0':
+ resolution: {integrity: sha512-7F91fcbuDf/d3S8o21+r3ZncGIke/+eWk0EpO21LXhDfLahriZF9CGj4fbAetEjlaBdjdSm9a6VeXbpbT6Z40Q==}
engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
'@typescript-eslint/parser': ^7.0.0
@@ -1802,8 +1629,8 @@ packages:
typescript:
optional: true
- '@typescript-eslint/parser@7.11.0':
- resolution: {integrity: sha512-yimw99teuaXVWsBcPO1Ais02kwJ1jmNA1KxE7ng0aT7ndr1pT1wqj0OJnsYVGKKlc4QJai86l/025L6z8CljOg==}
+ '@typescript-eslint/parser@7.12.0':
+ resolution: {integrity: sha512-dm/J2UDY3oV3TKius2OUZIFHsomQmpHtsV0FTh1WO8EKgHLQ1QCADUqscPgTpU+ih1e21FQSRjXckHn3txn6kQ==}
engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
eslint: ^8.56.0
@@ -1812,12 +1639,12 @@ packages:
typescript:
optional: true
- '@typescript-eslint/scope-manager@7.11.0':
- resolution: {integrity: sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==}
+ '@typescript-eslint/scope-manager@7.12.0':
+ resolution: {integrity: sha512-itF1pTnN6F3unPak+kutH9raIkL3lhH1YRPGgt7QQOh43DQKVJXmWkpb+vpc/TiDHs6RSd9CTbDsc/Y+Ygq7kg==}
engines: {node: ^18.18.0 || >=20.0.0}
- '@typescript-eslint/type-utils@7.11.0':
- resolution: {integrity: sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==}
+ '@typescript-eslint/type-utils@7.12.0':
+ resolution: {integrity: sha512-lib96tyRtMhLxwauDWUp/uW3FMhLA6D0rJ8T7HmH7x23Gk1Gwwu8UZ94NMXBvOELn6flSPiBrCKlehkiXyaqwA==}
engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
eslint: ^8.56.0
@@ -1826,12 +1653,12 @@ packages:
typescript:
optional: true
- '@typescript-eslint/types@7.11.0':
- resolution: {integrity: sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==}
+ '@typescript-eslint/types@7.12.0':
+ resolution: {integrity: sha512-o+0Te6eWp2ppKY3mLCU+YA9pVJxhUJE15FV7kxuD9jgwIAa+w/ycGJBMrYDTpVGUM/tgpa9SeMOugSabWFq7bg==}
engines: {node: ^18.18.0 || >=20.0.0}
- '@typescript-eslint/typescript-estree@7.11.0':
- resolution: {integrity: sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==}
+ '@typescript-eslint/typescript-estree@7.12.0':
+ resolution: {integrity: sha512-5bwqLsWBULv1h6pn7cMW5dXX/Y2amRqLaKqsASVwbBHMZSnHqE/HN4vT4fE0aFsiwxYvr98kqOWh1a8ZKXalCQ==}
engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
typescript: '*'
@@ -1839,14 +1666,14 @@ packages:
typescript:
optional: true
- '@typescript-eslint/utils@7.11.0':
- resolution: {integrity: sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==}
+ '@typescript-eslint/utils@7.12.0':
+ resolution: {integrity: sha512-Y6hhwxwDx41HNpjuYswYp6gDbkiZ8Hin9Bf5aJQn1bpTs3afYY4GX+MPYxma8jtoIV2GRwTM/UJm/2uGCVv+DQ==}
engines: {node: ^18.18.0 || >=20.0.0}
peerDependencies:
eslint: ^8.56.0
- '@typescript-eslint/visitor-keys@7.11.0':
- resolution: {integrity: sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==}
+ '@typescript-eslint/visitor-keys@7.12.0':
+ resolution: {integrity: sha512-uZk7DevrQLL3vSnfFl5bj4sL75qC9D6EdjemIdbtkuUmIheWpuiiylSY01JxJE7+zGrOWDZrp1WxOuDntvKrHQ==}
engines: {node: ^18.18.0 || >=20.0.0}
'@ungap/structured-clone@1.2.0':
@@ -1872,9 +1699,9 @@ packages:
engines: {node: '>=0.4.0'}
hasBin: true
- adm-zip@0.5.12:
- resolution: {integrity: sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==}
- engines: {node: '>=6.0'}
+ adm-zip@0.5.14:
+ resolution: {integrity: sha512-DnyqqifT4Jrcvb8USYjp6FHtBpEIz1mnXu6pTRHZ0RL69LbQYiO+0lDFg5+OKA7U29oWSs3a/i8fhn8ZcceIWg==}
+ engines: {node: '>=12.0'}
agent-base@7.1.1:
resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==}
@@ -1886,12 +1713,6 @@ packages:
peerDependencies:
react: npm:react@rc
- airbnb-prop-types@2.16.0:
- resolution: {integrity: sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==}
- deprecated: This package has been renamed to 'prop-types-tools'
- peerDependencies:
- react: npm:react@rc
-
ajv@6.12.6:
resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
@@ -1907,10 +1728,6 @@ packages:
ansi-align@2.0.0:
resolution: {integrity: sha512-TdlOggdA/zURfMYa7ABC66j+oqfMew58KpJMbUlH3bcZP1b+cBHIHDDn5uH9INsxrHBPjsqM0tDB4jPTF/vgJA==}
- ansi-colors@4.1.1:
- resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==}
- engines: {node: '>=6'}
-
ansi-escapes@6.2.1:
resolution: {integrity: sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==}
engines: {node: '>=14.16'}
@@ -1935,10 +1752,6 @@ packages:
resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
engines: {node: '>=8'}
- ansi-styles@5.2.0:
- resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
- engines: {node: '>=10'}
-
ansi-styles@6.2.1:
resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
engines: {node: '>=12'}
@@ -1956,9 +1769,6 @@ packages:
argparse@2.0.1:
resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
- aria-query@5.3.0:
- resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
-
array-buffer-byte-length@1.0.1:
resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
engines: {node: '>= 0.4'}
@@ -1974,14 +1784,6 @@ packages:
resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
engines: {node: '>=8'}
- array.prototype.filter@1.0.4:
- resolution: {integrity: sha512-r+mCJ7zXgXElgR4IRC+fkvNCeoaavWBs6EdCso5Tbcf+iEMKzBU/His60lt34WEZ9vlb8wDkZvQGcVI5GwkfoQ==}
- engines: {node: '>= 0.4'}
-
- array.prototype.find@2.2.3:
- resolution: {integrity: sha512-fO/ORdOELvjbbeIfZfzrXFMhYHGofRGqd+am9zm3tZ4GlJINj/pA2eITyfd65Vg6+ZbHd/Cys7stpoRSWtQFdA==}
- engines: {node: '>= 0.4'}
-
array.prototype.findlast@1.2.5:
resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
engines: {node: '>= 0.4'}
@@ -2008,9 +1810,6 @@ packages:
resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
engines: {node: '>= 0.4'}
- assertion-error@1.1.0:
- resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
-
astral-regex@2.0.0:
resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
engines: {node: '>=8'}
@@ -2062,9 +1861,6 @@ packages:
resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
engines: {node: '>=8'}
- boolbase@1.0.0:
- resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
-
boolean@3.2.0:
resolution: {integrity: sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==}
@@ -2086,9 +1882,6 @@ packages:
resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
engines: {node: '>=8'}
- browser-stdout@1.3.1:
- resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==}
-
browserslist@4.23.0:
resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}
engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -2097,9 +1890,6 @@ packages:
buffer-crc32@0.2.13:
resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
- buffer-from@1.1.2:
- resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
-
buffer@6.0.3:
resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
@@ -2152,16 +1942,6 @@ packages:
ccount@2.0.1:
resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
- chai-dom@1.12.0:
- resolution: {integrity: sha512-pLP8h6IBR8z1AdeQ+EMcJ7dXPdsax/1Q7gdGZjsnAmSBl3/gItQUYSCo32br1qOy4SlcBjvqId7ilAf3uJ2K1w==}
- engines: {node: '>= 0.12.0'}
- peerDependencies:
- chai: '>= 3'
-
- chai@4.4.1:
- resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==}
- engines: {node: '>=4'}
-
chalk@2.4.2:
resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
engines: {node: '>=4'}
@@ -2186,20 +1966,6 @@ packages:
character-reference-invalid@2.0.1:
resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
- check-error@1.0.3:
- resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
-
- cheerio-select@2.1.0:
- resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
-
- cheerio@1.0.0-rc.12:
- resolution: {integrity: sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==}
- engines: {node: '>= 6'}
-
- chokidar@3.5.3:
- resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
- engines: {node: '>= 8.10.0'}
-
chokidar@3.6.0:
resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
engines: {node: '>= 8.10.0'}
@@ -2225,17 +1991,10 @@ packages:
client-only@0.0.1:
resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
- cliui@7.0.4:
- resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
-
cliui@8.0.1:
resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
engines: {node: '>=12'}
- clone-deep@4.0.1:
- resolution: {integrity: sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==}
- engines: {node: '>=6'}
-
clone-response@1.0.3:
resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
@@ -2276,16 +2035,10 @@ packages:
resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
engines: {node: '>=18'}
- commander@2.20.3:
- resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
-
commander@4.1.1:
resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
engines: {node: '>= 6'}
- commondir@1.0.1:
- resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
-
compare-func@2.0.0:
resolution: {integrity: sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==}
@@ -2380,26 +2133,15 @@ packages:
resolution: {integrity: sha512-c+N0v6wbKVxTu5gOBBFkr9BEdBWaqqjQeiJ8QvSRIJOf+UxlJh930m8e6/WNeODIK0mYLFkoONrnj16i2EcvfQ==}
engines: {node: '>=12 || >=16'}
- css-select@5.1.0:
- resolution: {integrity: sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==}
-
css-tree@2.3.1:
resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
- css-what@6.1.0:
- resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
- engines: {node: '>= 6'}
-
cssesc@3.0.0:
resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
engines: {node: '>=4'}
hasBin: true
- cssstyle@4.0.1:
- resolution: {integrity: sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==}
- engines: {node: '>=18'}
-
csstype@3.1.3:
resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
@@ -2415,10 +2157,6 @@ packages:
resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
engines: {node: '>= 12'}
- data-urls@5.0.0:
- resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
- engines: {node: '>=18'}
-
data-view-buffer@1.0.1:
resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
engines: {node: '>= 0.4'}
@@ -2459,13 +2197,6 @@ packages:
supports-color:
optional: true
- decamelize@4.0.0:
- resolution: {integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==}
- engines: {node: '>=10'}
-
- decimal.js@10.4.3:
- resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
-
decode-named-character-reference@1.0.2:
resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==}
@@ -2481,10 +2212,6 @@ packages:
babel-plugin-macros:
optional: true
- deep-eql@4.1.3:
- resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
- engines: {node: '>=6'}
-
deep-extend@0.6.0:
resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
engines: {node: '>=4.0.0'}
@@ -2527,21 +2254,10 @@ packages:
didyoumean@1.2.2:
resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
- diff@5.0.0:
- resolution: {integrity: sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==}
- engines: {node: '>=0.3.1'}
-
- diff@5.2.0:
- resolution: {integrity: sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==}
- engines: {node: '>=0.3.1'}
-
dir-glob@3.0.1:
resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
engines: {node: '>=8'}
- discontinuous-range@1.0.0:
- resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==}
-
dlv@1.1.3:
resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
@@ -2553,12 +2269,6 @@ packages:
resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
engines: {node: '>=6.0.0'}
- dom-accessibility-api@0.5.16:
- resolution: {integrity: sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==}
-
- dom-accessibility-api@0.6.3:
- resolution: {integrity: sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==}
-
dom-helpers@5.2.1:
resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}
@@ -2637,17 +2347,6 @@ packages:
resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
engines: {node: '>=6'}
- enzyme-adapter-utils@1.14.2:
- resolution: {integrity: sha512-1ZC++RlsYRaiOWE5NRaF5OgsMt7F5rn/VuaJIgc7eW/fmgg8eS1/Ut7EugSPPi7VMdWMLcymRnMF+mJUJ4B8KA==}
- peerDependencies:
- react: npm:react@rc
-
- enzyme-shallow-equal@1.0.7:
- resolution: {integrity: sha512-/um0GFqUXnpM9SvKtje+9Tjoz3f1fpBC3eXRFrNs8kpYn69JljciYP7KZTqM/YQbUY9KUjvKB4jo/q+L6WGGvg==}
-
- enzyme@3.11.0:
- resolution: {integrity: sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==}
-
errno@0.1.8:
resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
hasBin: true
@@ -2659,9 +2358,6 @@ packages:
resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
engines: {node: '>= 0.4'}
- es-array-method-boxes-properly@1.0.0:
- resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==}
-
es-define-property@1.0.0:
resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
engines: {node: '>= 0.4'}
@@ -2947,17 +2643,9 @@ packages:
resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
engines: {node: '>=8'}
- find-cache-dir@2.1.0:
- resolution: {integrity: sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==}
- engines: {node: '>=6'}
-
find-root@1.1.0:
resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
- find-up@3.0.0:
- resolution: {integrity: sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==}
- engines: {node: '>=6'}
-
find-up@5.0.0:
resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
engines: {node: '>=10'}
@@ -2974,10 +2662,6 @@ packages:
resolution: {integrity: sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==}
engines: {node: '>=18'}
- flat@5.0.2:
- resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
- hasBin: true
-
flatted@3.3.1:
resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
@@ -3001,9 +2685,6 @@ packages:
resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
engines: {node: '>= 6'}
- format-util@1.0.5:
- resolution: {integrity: sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==}
-
formdata-polyfill@4.0.10:
resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
engines: {node: '>=12.20.0'}
@@ -3011,8 +2692,8 @@ packages:
fraction.js@4.3.7:
resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
- framer-motion@11.2.9:
- resolution: {integrity: sha512-gfxNSkp4dC3vpy2hGNQK3K9bNOKwfasqOhrqvmZzYxCPSJ9Tpv/9JlCkeCMgFdKefgPr8+JiouGjVmaDzu750w==}
+ framer-motion@11.2.10:
+ resolution: {integrity: sha512-/gr3PLZUVFCc86a9MqCUboVrALscrdluzTb3yew+2/qKBU8CX6nzs918/SRBRCqaPbx0TZP10CB6yFgK2C5cYQ==}
peerDependencies:
'@emotion/is-prop-valid': '*'
react: npm:react@rc
@@ -3036,11 +2717,6 @@ packages:
fs.realpath@1.0.0:
resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
- fsevents@2.3.2:
- resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
- engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
- os: [darwin]
-
fsevents@2.3.3:
resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -3073,9 +2749,6 @@ packages:
resolution: {integrity: sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==}
engines: {node: '>=18'}
- get-func-name@2.0.2:
- resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
-
get-intrinsic@1.2.4:
resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
engines: {node: '>= 0.4'}
@@ -3124,11 +2797,6 @@ packages:
resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
deprecated: Glob versions prior to v9 are no longer supported
- glob@8.1.0:
- resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
- engines: {node: '>=12'}
- deprecated: Glob versions prior to v9 are no longer supported
-
global-agent@3.0.0:
resolution: {integrity: sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==}
engines: {node: '>=10.0'}
@@ -3214,10 +2882,6 @@ packages:
resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
engines: {node: '>= 0.4'}
- has@1.0.4:
- resolution: {integrity: sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==}
- engines: {node: '>= 0.4.0'}
-
hasown@2.0.2:
resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
engines: {node: '>= 0.4'}
@@ -3228,20 +2892,9 @@ packages:
hast-util-whitespace@3.0.0:
resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
- he@1.2.0:
- resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
- hasBin: true
-
hoist-non-react-statics@3.3.2:
resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
- html-element-map@1.3.1:
- resolution: {integrity: sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==}
-
- html-encoding-sniffer@4.0.0:
- resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
- engines: {node: '>=18'}
-
html-parse-stringify@3.0.1:
resolution: {integrity: sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==}
@@ -3264,10 +2917,6 @@ packages:
http-cache-semantics@4.1.1:
resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
- http-proxy-agent@7.0.2:
- resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
- engines: {node: '>= 14'}
-
http2-wrapper@1.0.3:
resolution: {integrity: sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==}
engines: {node: '>=10.19.0'}
@@ -3487,25 +3136,14 @@ packages:
resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
engines: {node: '>=8'}
- is-plain-obj@2.1.0:
- resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
- engines: {node: '>=8'}
-
is-plain-obj@4.1.0:
resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
engines: {node: '>=12'}
- is-plain-object@2.0.4:
- resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
- engines: {node: '>=0.10.0'}
-
is-plain-object@5.0.0:
resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
engines: {node: '>=0.10.0'}
- is-potential-custom-element-name@1.0.1:
- resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
-
is-redirect@1.0.0:
resolution: {integrity: sha512-cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw==}
engines: {node: '>=0.10.0'}
@@ -3538,9 +3176,6 @@ packages:
resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
engines: {node: '>= 0.4'}
- is-subset@0.1.1:
- resolution: {integrity: sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==}
-
is-symbol@1.0.4:
resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
engines: {node: '>= 0.4'}
@@ -3556,10 +3191,6 @@ packages:
is-typedarray@1.0.0:
resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
- is-unicode-supported@0.1.0:
- resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
- engines: {node: '>=10'}
-
is-weakmap@2.0.2:
resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
engines: {node: '>= 0.4'}
@@ -3580,10 +3211,6 @@ packages:
isexe@2.0.0:
resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
- isobject@3.0.1:
- resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
- engines: {node: '>=0.10.0'}
-
iterator.prototype@1.1.2:
resolution: {integrity: sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==}
@@ -3595,8 +3222,8 @@ packages:
resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==}
hasBin: true
- jotai@2.8.2:
- resolution: {integrity: sha512-AU+EU82YqP94izfbGYQQL3oa/06gmn+Ijf/CKx0QybAURtbqh2e4N6zA2fxeIh0JEUgASF6z5IhagJ8NicR95A==}
+ jotai@2.8.3:
+ resolution: {integrity: sha512-pR4plVvdbzB6zyt7VLLHPMAkcRSKhRIvZKd+qkifQLa3CEziEo1uwZjePj4acTmQrboiISBlYSdCz3gWcr1Nkg==}
engines: {node: '>=12.20.0'}
peerDependencies:
'@types/react': npm:types-react@rc
@@ -3623,15 +3250,6 @@ packages:
jsbn@1.1.0:
resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}
- jsdom@24.1.0:
- resolution: {integrity: sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==}
- engines: {node: '>=18'}
- peerDependencies:
- canvas: ^2.11.2
- peerDependenciesMeta:
- canvas:
- optional: true
-
jsesc@2.5.2:
resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
engines: {node: '>=4'}
@@ -3682,9 +3300,6 @@ packages:
resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
engines: {node: '>=4.0'}
- just-extend@6.2.0:
- resolution: {integrity: sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==}
-
keyv@4.5.4:
resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
@@ -3692,9 +3307,6 @@ packages:
resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
engines: {node: '>=0.10.0'}
- known-css-properties@0.30.0:
- resolution: {integrity: sha512-VSWXYUnsPu9+WYKkfmJyLKtIvaRJi1kXUqVmBACORXZQxT5oZDsoZ2vQP+bQFDnWtpI/4eq3MLoRMjI2fnLzTQ==}
-
known-css-properties@0.31.0:
resolution: {integrity: sha512-sBPIUGTNF0czz0mwGGUoKKJC8Q7On1GPbCSFPfyEsfHb2DyBG0Y4QtV+EVWpINSaiGKZblDNuF5AezxSgOhesQ==}
@@ -3731,10 +3343,6 @@ packages:
resolution: {integrity: sha512-irTfvpib/rNiD637xeevjO2l3Z5loZmuaRi0L0YE5LfijwVY96oyVn0DFD3o/teAok7nfobMG1THvvcHh/BP6g==}
engines: {node: '>=18.0.0'}
- locate-path@3.0.0:
- resolution: {integrity: sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==}
- engines: {node: '>=6'}
-
locate-path@6.0.0:
resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
engines: {node: '>=10'}
@@ -3755,15 +3363,6 @@ packages:
lodash.debounce@4.0.8:
resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
- lodash.escape@4.0.1:
- resolution: {integrity: sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==}
-
- lodash.flattendeep@4.4.0:
- resolution: {integrity: sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==}
-
- lodash.get@4.4.2:
- resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
-
lodash.isequal@4.5.0:
resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
@@ -3797,10 +3396,6 @@ packages:
lodash@4.17.21:
resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
- log-symbols@4.1.0:
- resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
- engines: {node: '>=10'}
-
log-update@6.0.0:
resolution: {integrity: sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==}
engines: {node: '>=18'}
@@ -3812,9 +3407,6 @@ packages:
resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
hasBin: true
- loupe@2.3.7:
- resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
-
lower-case@2.0.2:
resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
@@ -3836,10 +3428,6 @@ packages:
lru-cache@5.1.1:
resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
- lz-string@1.5.0:
- resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
- hasBin: true
-
make-dir@1.3.0:
resolution: {integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==}
engines: {node: '>=4'}
@@ -4009,10 +3597,6 @@ packages:
minimatch@3.1.2:
resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
- minimatch@5.0.1:
- resolution: {integrity: sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==}
- engines: {node: '>=10'}
-
minimatch@9.0.4:
resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==}
engines: {node: '>=16 || 14 >=14.17'}
@@ -4024,17 +3608,9 @@ packages:
resolution: {integrity: sha512-oGZRv2OT1lO2UF1zUcwdTb3wqUwI0kBGTgt/T7OdSj6M6N5m3o5uPf0AIW6lVxGGoiWUR7e2AwTE+xiwK8WQig==}
engines: {node: '>=16 || 14 >=14.17'}
- mocha@10.4.0:
- resolution: {integrity: sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==}
- engines: {node: '>= 14.0.0'}
- hasBin: true
-
monaco-editor@0.49.0:
resolution: {integrity: sha512-2I8/T3X/hLxB2oPHgqcNYUVdA/ZEFShT7IAujifIPMfKkNbLOqY8XCoyHCXrsdjb36dW9MwoTwBCFpXKMwNwaQ==}
- moo@0.5.2:
- resolution: {integrity: sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==}
-
ms@2.0.0:
resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
@@ -4068,10 +3644,6 @@ packages:
natural-compare@1.4.0:
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
- nearley@2.20.1:
- resolution: {integrity: sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==}
- hasBin: true
-
needle@3.3.1:
resolution: {integrity: sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==}
engines: {node: '>= 4.4.x'}
@@ -4080,9 +3652,6 @@ packages:
next-tick@1.1.0:
resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
- nise@5.1.9:
- resolution: {integrity: sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==}
-
no-case@3.0.4:
resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
@@ -4137,12 +3706,6 @@ packages:
resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
- nth-check@2.1.1:
- resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
-
- nwsapi@2.2.10:
- resolution: {integrity: sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==}
-
object-assign@4.1.1:
resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
engines: {node: '>=0.10.0'}
@@ -4154,10 +3717,6 @@ packages:
object-inspect@1.13.1:
resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
- object-is@1.1.6:
- resolution: {integrity: sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==}
- engines: {node: '>= 0.4'}
-
object-keys@1.1.1:
resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
engines: {node: '>= 0.4'}
@@ -4212,10 +3771,6 @@ packages:
resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
engines: {node: '>=4'}
- p-limit@2.3.0:
- resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
- engines: {node: '>=6'}
-
p-limit@3.1.0:
resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
engines: {node: '>=10'}
@@ -4224,10 +3779,6 @@ packages:
resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
- p-locate@3.0.0:
- resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==}
- engines: {node: '>=6'}
-
p-locate@5.0.0:
resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
engines: {node: '>=10'}
@@ -4236,10 +3787,6 @@ packages:
resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
- p-try@2.2.0:
- resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
- engines: {node: '>=6'}
-
package-json@4.0.1:
resolution: {integrity: sha512-q/R5GrMek0vzgoomq6rm9OX+3PQve8sLwTirmK30YB3Cu0Bbt9OX9M/SIUnroN5BGJkzwGsFwDaRGD9EwBOlCA==}
engines: {node: '>=4'}
@@ -4262,19 +3809,9 @@ packages:
resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
engines: {node: '>= 0.10'}
- parse5-htmlparser2-tree-adapter@7.0.0:
- resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
-
- parse5@7.1.2:
- resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
-
path-browserify@1.0.1:
resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
- path-exists@3.0.0:
- resolution: {integrity: sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==}
- engines: {node: '>=4'}
-
path-exists@4.0.0:
resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
engines: {node: '>=8'}
@@ -4309,22 +3846,13 @@ packages:
resolution: {integrity: sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==}
engines: {node: '>=16 || 14 >=14.17'}
- path-to-regexp@6.2.2:
- resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==}
-
path-type@4.0.0:
resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
engines: {node: '>=8'}
- pathval@1.1.1:
- resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
-
pend@1.2.0:
resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
- performance-now@2.1.0:
- resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
-
picocolors@1.0.1:
resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
@@ -4353,20 +3881,6 @@ packages:
resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
engines: {node: '>= 6'}
- pkg-dir@3.0.0:
- resolution: {integrity: sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==}
- engines: {node: '>=6'}
-
- playwright-core@1.44.1:
- resolution: {integrity: sha512-wh0JWtYTrhv1+OSsLPgFzGzt67Y7BE/ZS3jEqgGBlp2ppp1ZDj8c+9IARNW4dwf1poq5MgHreEM2KV/GuR4cFA==}
- engines: {node: '>=16'}
- hasBin: true
-
- playwright@1.44.1:
- resolution: {integrity: sha512-qr/0UJ5CFAtloI3avF95Y0L1xQo6r3LQArLIg/z/PoGJ6xa+EwzrwO5lpNr/09STxdHuUoP2mvuELJS+hLdtgg==}
- engines: {node: '>=16'}
- hasBin: true
-
possible-typed-array-names@1.0.0:
resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
engines: {node: '>= 0.4'}
@@ -4503,23 +4017,15 @@ packages:
peerDependencies:
prettier: ^3.0.3
- prettier@3.2.5:
- resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==}
+ prettier@3.3.1:
+ resolution: {integrity: sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==}
engines: {node: '>=14'}
hasBin: true
- pretty-format@27.5.1:
- resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
- engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
-
progress@2.0.3:
resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
engines: {node: '>=0.4.0'}
- prop-types-exact@1.2.4:
- resolution: {integrity: sha512-vKfETKgBHRCLQwZgpl0pGPvMFxCX/06dAkz5jwNYHfrU0I8bgVhryaHA6O/KlqwtQi0IdnjAhDiZqzD+uJuVjA==}
- engines: {node: '>= 0.8'}
-
prop-types@15.8.1:
resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
@@ -4535,9 +4041,6 @@ packages:
pseudomap@1.0.2:
resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==}
- psl@1.9.0:
- resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
-
pump@3.0.0:
resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
@@ -4545,9 +4048,6 @@ packages:
resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
engines: {node: '>=6'}
- querystringify@2.2.0:
- resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
-
queue-microtask@1.2.3:
resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
@@ -4555,19 +4055,6 @@ packages:
resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
engines: {node: '>=10'}
- raf@3.4.1:
- resolution: {integrity: sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==}
-
- railroad-diagrams@1.0.0:
- resolution: {integrity: sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==}
-
- randexp@0.4.6:
- resolution: {integrity: sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==}
- engines: {node: '>=0.12'}
-
- randombytes@2.1.0:
- resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
-
rc@1.2.8:
resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
hasBin: true
@@ -4635,9 +4122,6 @@ packages:
react-is@16.13.1:
resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
- react-is@17.0.2:
- resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
-
react-is@18.3.1:
resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
@@ -4647,12 +4131,6 @@ packages:
'@types/react': npm:types-react@rc
react: npm:react@rc
- react-reconciler@0.29.2:
- resolution: {integrity: sha512-zZQqIiYgDCTP/f1N/mAR10nJGrPD2ZR+jDSEsKWJHYC7Cm2wodlwbR3upZRdC3cjIjSlTLNVyO7Iu0Yy7t2AYg==}
- engines: {node: '>=0.10.0'}
- peerDependencies:
- react: npm:react@rc
-
react-refresh@0.14.2:
resolution: {integrity: sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==}
engines: {node: '>=0.10.0'}
@@ -4670,16 +4148,6 @@ packages:
peerDependencies:
react: npm:react@rc
- react-shallow-renderer@16.15.0:
- resolution: {integrity: sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA==}
- peerDependencies:
- react: npm:react@rc
-
- react-test-renderer@18.3.1:
- resolution: {integrity: sha512-KkAgygexHUkQqtvvx/otwxtuFu5cVjfzTCtjXLH9boS19/Nbtg84zS7wIQn39G8IlrhThBpQsMKkq5ZHZIYFXA==}
- peerDependencies:
- react: npm:react@rc
-
react-transition-group@4.4.5:
resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==}
peerDependencies:
@@ -4715,9 +4183,6 @@ packages:
resolution: {integrity: sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==}
engines: {node: '>= 0.4'}
- reflect.ownkeys@1.1.4:
- resolution: {integrity: sha512-iUNmtLgzudssL+qnTUosCmnq3eczlrVd1wXrgx/GhiI/8FvwrTYWtCJ9PNvWIRX+4ftupj2WUfB5mu5s9t6LnA==}
-
regenerator-runtime@0.14.1:
resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
@@ -4746,9 +4211,6 @@ packages:
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
engines: {node: '>=0.10.0'}
- requires-port@1.0.0:
- resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
-
reselect@4.1.8:
resolution: {integrity: sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==}
@@ -4787,10 +4249,6 @@ packages:
resolution: {integrity: sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
- ret@0.1.15:
- resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
- engines: {node: '>=0.12'}
-
reusify@1.0.4:
resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
@@ -4812,15 +4270,6 @@ packages:
engines: {node: '>=18.0.0', npm: '>=8.0.0'}
hasBin: true
- rrweb-cssom@0.6.0:
- resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==}
-
- rrweb-cssom@0.7.0:
- resolution: {integrity: sha512-KlSv0pm9kgQSRxXEMgtivPJ4h826YHsuob8pSHcfSZsSXGtvpEAie8S0AnXuObEJ7nhikOb4ahwxDm0H2yW17g==}
-
- rst-selector-parser@2.2.3:
- resolution: {integrity: sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==}
-
run-parallel@1.2.0:
resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
@@ -4846,13 +4295,6 @@ packages:
sax@1.3.0:
resolution: {integrity: sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==}
- saxes@6.0.0:
- resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
- engines: {node: '>=v12.22.7'}
-
- scheduler@0.23.2:
- resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
-
scheduler@0.25.0-rc-9d4fba0788-20240530:
resolution: {integrity: sha512-FgnludCfIyBWBUApENx+tMalmqphFZ8MDj74iS7vlj2oaL75R4Ws+XdfSIQ5RFXFTD/zfyXVh5wtKHrs6iBkcQ==}
@@ -4884,9 +4326,6 @@ packages:
resolution: {integrity: sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==}
engines: {node: '>=10'}
- serialize-javascript@6.0.0:
- resolution: {integrity: sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==}
-
set-function-length@1.2.2:
resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
engines: {node: '>= 0.4'}
@@ -4895,10 +4334,6 @@ packages:
resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
engines: {node: '>= 0.4'}
- shallow-clone@3.0.1:
- resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
- engines: {node: '>=8'}
-
shebang-command@1.2.0:
resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
engines: {node: '>=0.10.0'}
@@ -4918,8 +4353,8 @@ packages:
shell-quote@1.8.1:
resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
- shiki@1.6.1:
- resolution: {integrity: sha512-1Pu/A1rtsG6HZvQm4W0NExQ45e02og+rPog7PDaFDiMumZgOYnZIu4JtGQeAIfMwdbKSjJQoCUr79vDLKUUxWA==}
+ shiki@1.6.2:
+ resolution: {integrity: sha512-X3hSm5GzzBd/BmPmGfkueOUADLyBoZo1ojYQXhd+NU2VJn458yt4duaS0rVzC+WtqftSV7mTVvDw+OB9AHi3Eg==}
side-channel@1.0.6:
resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
@@ -4932,9 +4367,6 @@ packages:
resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
engines: {node: '>=14'}
- sinon@16.1.3:
- resolution: {integrity: sha512-mjnWWeyxcAf9nC0bXcPmiDut+oE8HYridTNzBbF98AYVLmWwGRp2ISEpyhYflG1ifILT+eNn3BmKUJPxjXUPlA==}
-
slash@3.0.0:
resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
engines: {node: '>=8'}
@@ -4969,9 +4401,6 @@ packages:
resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
engines: {node: '>=0.10.0'}
- source-map-support@0.5.21:
- resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
-
source-map@0.5.7:
resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
engines: {node: '>=0.10.0'}
@@ -5105,8 +4534,8 @@ packages:
peerDependencies:
stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
- stylelint-scss@6.3.0:
- resolution: {integrity: sha512-8OSpiuf1xC7f8kllJsBOFAOYp/mR/C1FXMVeOFjtJPw+AFvEmC93FaklHt7MlOqU4poxuQ1TkYMyfI0V+1SxjA==}
+ stylelint-scss@6.3.1:
+ resolution: {integrity: sha512-w/czBoWUZxJNk5fBRPODcXSN4qcPv3WHjTSSpFovVY+TE3MZTMR0yRlbmaDYrm8tTWHvpwQAuEBZ0lk2wwkboQ==}
engines: {node: '>=18.12.0'}
peerDependencies:
stylelint: ^16.0.2
@@ -5140,10 +4569,6 @@ packages:
resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
engines: {node: '>=8'}
- supports-color@8.1.1:
- resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
- engines: {node: '>=10'}
-
supports-hyperlinks@3.0.0:
resolution: {integrity: sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==}
engines: {node: '>=14.18'}
@@ -5163,9 +4588,6 @@ packages:
peerDependencies:
react: npm:react@rc
- symbol-tree@3.2.4:
- resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
-
synckit@0.8.8:
resolution: {integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==}
engines: {node: ^14.18.0 || >=16.0.0}
@@ -5174,13 +4596,13 @@ packages:
resolution: {integrity: sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==}
engines: {node: '>=10.0.0'}
- tailwindcss@3.4.3:
- resolution: {integrity: sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==}
+ tailwindcss@3.4.4:
+ resolution: {integrity: sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==}
engines: {node: '>=14.0.0'}
hasBin: true
- telegram@2.21.2:
- resolution: {integrity: sha512-fvLY49uXsL+TyDdGv7K1JOMMdd0AUkBx+kb5NRC3UYB30Y0h4IQPmTyAAQI6i6/6x6Of6ZK0nXezlSXC9es+EA==}
+ telegram@2.22.2:
+ resolution: {integrity: sha512-9payizc801Aqqu4eTGPc0huxKnIwFe0hn18mrpbgAKKiMLurX/UIQW/fjPhI5ONzockDFsaXDFqTreXBoG1u3A==}
term-size@1.2.0:
resolution: {integrity: sha512-7dPUZQGy/+m3/wjVz3ZW5dobSoD/02NxJpoXUX0WIyjfVS3l0c+b/+9phIDFA7FHzkYtwtMFgeGZ/Y8jVTeqQQ==}
@@ -5215,14 +4637,6 @@ packages:
resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
engines: {node: '>=8.0'}
- tough-cookie@4.1.4:
- resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==}
- engines: {node: '>=6'}
-
- tr46@5.0.0:
- resolution: {integrity: sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==}
- engines: {node: '>=18'}
-
trim-lines@3.0.1:
resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
@@ -5262,8 +4676,8 @@ packages:
tslib@2.6.2:
resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
- tsx@4.11.0:
- resolution: {integrity: sha512-vzGGELOgAupsNVssAmZjbUDfdm/pWP4R+Kg8TVdsonxbXk0bEpE1qh0yV6/QxUVXaVlNemgcPajGdJJ82n3stg==}
+ tsx@4.12.0:
+ resolution: {integrity: sha512-642NAWAbDqPZINjmL32Lh/B+pd8vbVj6LHPsWm09IIHqQuWhCrNfcPTjRlHFWvv3FfM4vt9NLReBIjUNj5ZhDg==}
engines: {node: '>=18.0.0'}
hasBin: true
@@ -5275,10 +4689,6 @@ packages:
resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
engines: {node: '>= 0.8.0'}
- type-detect@4.0.8:
- resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
- engines: {node: '>=4'}
-
type-fest@0.13.1:
resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
engines: {node: '>=10'}
@@ -5374,10 +4784,6 @@ packages:
resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
engines: {node: '>= 4.0.0'}
- universalify@0.2.0:
- resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
- engines: {node: '>= 4.0.0'}
-
universalify@2.0.1:
resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
engines: {node: '>= 10.0.0'}
@@ -5403,9 +4809,6 @@ packages:
resolution: {integrity: sha512-BVA4lR5PIviy2PMseNd2jbFQ+jwSwQGdJejf5ctd1rEXt0Ypd7yanUK9+lYechVlN5VaTJGsu2U/3MDDu6KgBA==}
engines: {node: '>=0.10.0'}
- url-parse@1.5.10:
- resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
-
use-resize-observer@9.1.0:
resolution: {integrity: sha512-R25VqO9Wb3asSD4eqtcxk8sJalvIOYBqS8MNZlpDSQ4l4xMQxC/J7Id9HoTqPq8FwULIn0PVW+OAqF2dyYbjow==}
peerDependencies:
@@ -5509,34 +4912,14 @@ packages:
resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
engines: {node: '>=0.10.0'}
- w3c-xmlserializer@5.0.0:
- resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
- engines: {node: '>=18'}
-
web-streams-polyfill@3.3.3:
resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
engines: {node: '>= 8'}
- webidl-conversions@7.0.0:
- resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
- engines: {node: '>=12'}
-
websocket@1.0.35:
resolution: {integrity: sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==}
engines: {node: '>=4.0.0'}
- whatwg-encoding@3.1.1:
- resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
- engines: {node: '>=18'}
-
- whatwg-mimetype@4.0.0:
- resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
- engines: {node: '>=18'}
-
- whatwg-url@14.0.0:
- resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==}
- engines: {node: '>=18'}
-
which-boxed-primitive@1.0.2:
resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
@@ -5569,9 +4952,6 @@ packages:
resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
engines: {node: '>=0.10.0'}
- workerpool@6.2.1:
- resolution: {integrity: sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==}
-
wrap-ansi@7.0.0:
resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
engines: {node: '>=10'}
@@ -5609,29 +4989,10 @@ packages:
utf-8-validate:
optional: true
- ws@8.17.0:
- resolution: {integrity: sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==}
- engines: {node: '>=10.0.0'}
- peerDependencies:
- bufferutil: ^4.0.1
- utf-8-validate: '>=5.0.2'
- peerDependenciesMeta:
- bufferutil:
- optional: true
- utf-8-validate:
- optional: true
-
xdg-basedir@3.0.0:
resolution: {integrity: sha512-1Dly4xqlulvPD3fZUQJLY+FUIeqN3N2MM3uqe4rCJftAvOjFa3jFGfctOgluGx4ahPbUCsZkmJILiP0Vi4T6lQ==}
engines: {node: '>=4'}
- xml-name-validator@5.0.0:
- resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
- engines: {node: '>=18'}
-
- xmlchars@2.2.0:
- resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
-
y18n@5.0.8:
resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
engines: {node: '>=10'}
@@ -5655,22 +5016,10 @@ packages:
engines: {node: '>= 14'}
hasBin: true
- yargs-parser@20.2.4:
- resolution: {integrity: sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==}
- engines: {node: '>=10'}
-
yargs-parser@21.1.1:
resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
engines: {node: '>=12'}
- yargs-unparser@2.0.0:
- resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==}
- engines: {node: '>=10'}
-
- yargs@16.2.0:
- resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
- engines: {node: '>=10'}
-
yargs@17.7.2:
resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
engines: {node: '>=12'}
@@ -5717,11 +5066,6 @@ snapshots:
'@babel/highlight': 7.24.5
picocolors: 1.0.1
- '@babel/code-frame@7.24.6':
- dependencies:
- '@babel/highlight': 7.24.6
- picocolors: 1.0.1
-
'@babel/compat-data@7.24.4': {}
'@babel/core@7.24.5':
@@ -5737,7 +5081,7 @@ snapshots:
'@babel/traverse': 7.24.5
'@babel/types': 7.24.5
convert-source-map: 2.0.0
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@@ -5751,10 +5095,6 @@ snapshots:
'@jridgewell/trace-mapping': 0.3.25
jsesc: 2.5.2
- '@babel/helper-annotate-as-pure@7.24.6':
- dependencies:
- '@babel/types': 7.24.6
-
'@babel/helper-compilation-targets@7.23.6':
dependencies:
'@babel/compat-data': 7.24.4
@@ -5763,49 +5103,21 @@ snapshots:
lru-cache: 5.1.1
semver: 6.3.1
- '@babel/helper-create-class-features-plugin@7.24.6(@babel/core@7.24.5)':
- dependencies:
- '@babel/core': 7.24.5
- '@babel/helper-annotate-as-pure': 7.24.6
- '@babel/helper-environment-visitor': 7.24.6
- '@babel/helper-function-name': 7.24.6
- '@babel/helper-member-expression-to-functions': 7.24.6
- '@babel/helper-optimise-call-expression': 7.24.6
- '@babel/helper-replace-supers': 7.24.6(@babel/core@7.24.5)
- '@babel/helper-skip-transparent-expression-wrappers': 7.24.6
- '@babel/helper-split-export-declaration': 7.24.6
- semver: 6.3.1
-
'@babel/helper-environment-visitor@7.22.20': {}
- '@babel/helper-environment-visitor@7.24.6': {}
-
'@babel/helper-function-name@7.23.0':
dependencies:
'@babel/template': 7.24.0
'@babel/types': 7.24.5
- '@babel/helper-function-name@7.24.6':
- dependencies:
- '@babel/template': 7.24.6
- '@babel/types': 7.24.6
-
'@babel/helper-hoist-variables@7.22.5':
dependencies:
'@babel/types': 7.24.5
- '@babel/helper-member-expression-to-functions@7.24.6':
- dependencies:
- '@babel/types': 7.24.6
-
'@babel/helper-module-imports@7.24.3':
dependencies:
'@babel/types': 7.24.5
- '@babel/helper-module-imports@7.24.6':
- dependencies:
- '@babel/types': 7.24.6
-
'@babel/helper-module-transforms@7.24.5(@babel/core@7.24.5)':
dependencies:
'@babel/core': 7.24.5
@@ -5815,62 +5127,22 @@ snapshots:
'@babel/helper-split-export-declaration': 7.24.5
'@babel/helper-validator-identifier': 7.24.5
- '@babel/helper-module-transforms@7.24.6(@babel/core@7.24.5)':
- dependencies:
- '@babel/core': 7.24.5
- '@babel/helper-environment-visitor': 7.24.6
- '@babel/helper-module-imports': 7.24.6
- '@babel/helper-simple-access': 7.24.6
- '@babel/helper-split-export-declaration': 7.24.6
- '@babel/helper-validator-identifier': 7.24.6
-
- '@babel/helper-optimise-call-expression@7.24.6':
- dependencies:
- '@babel/types': 7.24.6
-
'@babel/helper-plugin-utils@7.24.5': {}
- '@babel/helper-plugin-utils@7.24.6': {}
-
- '@babel/helper-replace-supers@7.24.6(@babel/core@7.24.5)':
- dependencies:
- '@babel/core': 7.24.5
- '@babel/helper-environment-visitor': 7.24.6
- '@babel/helper-member-expression-to-functions': 7.24.6
- '@babel/helper-optimise-call-expression': 7.24.6
-
'@babel/helper-simple-access@7.24.5':
dependencies:
'@babel/types': 7.24.5
- '@babel/helper-simple-access@7.24.6':
- dependencies:
- '@babel/types': 7.24.6
-
- '@babel/helper-skip-transparent-expression-wrappers@7.24.6':
- dependencies:
- '@babel/types': 7.24.6
-
'@babel/helper-split-export-declaration@7.24.5':
dependencies:
'@babel/types': 7.24.5
- '@babel/helper-split-export-declaration@7.24.6':
- dependencies:
- '@babel/types': 7.24.6
-
'@babel/helper-string-parser@7.24.1': {}
- '@babel/helper-string-parser@7.24.6': {}
-
'@babel/helper-validator-identifier@7.24.5': {}
- '@babel/helper-validator-identifier@7.24.6': {}
-
'@babel/helper-validator-option@7.23.5': {}
- '@babel/helper-validator-option@7.24.6': {}
-
'@babel/helpers@7.24.5':
dependencies:
'@babel/template': 7.24.0
@@ -5886,38 +5158,10 @@ snapshots:
js-tokens: 4.0.0
picocolors: 1.0.1
- '@babel/highlight@7.24.6':
- dependencies:
- '@babel/helper-validator-identifier': 7.24.6
- chalk: 2.4.2
- js-tokens: 4.0.0
- picocolors: 1.0.1
-
'@babel/parser@7.24.5':
dependencies:
'@babel/types': 7.24.5
- '@babel/parser@7.24.6':
- dependencies:
- '@babel/types': 7.24.6
-
- '@babel/plugin-syntax-jsx@7.24.6(@babel/core@7.24.5)':
- dependencies:
- '@babel/core': 7.24.5
- '@babel/helper-plugin-utils': 7.24.6
-
- '@babel/plugin-syntax-typescript@7.24.6(@babel/core@7.24.5)':
- dependencies:
- '@babel/core': 7.24.5
- '@babel/helper-plugin-utils': 7.24.6
-
- '@babel/plugin-transform-modules-commonjs@7.24.6(@babel/core@7.24.5)':
- dependencies:
- '@babel/core': 7.24.5
- '@babel/helper-module-transforms': 7.24.6(@babel/core@7.24.5)
- '@babel/helper-plugin-utils': 7.24.6
- '@babel/helper-simple-access': 7.24.6
-
'@babel/plugin-transform-react-jsx-self@7.24.5(@babel/core@7.24.5)':
dependencies:
'@babel/core': 7.24.5
@@ -5928,32 +5172,6 @@ snapshots:
'@babel/core': 7.24.5
'@babel/helper-plugin-utils': 7.24.5
- '@babel/plugin-transform-typescript@7.24.6(@babel/core@7.24.5)':
- dependencies:
- '@babel/core': 7.24.5
- '@babel/helper-annotate-as-pure': 7.24.6
- '@babel/helper-create-class-features-plugin': 7.24.6(@babel/core@7.24.5)
- '@babel/helper-plugin-utils': 7.24.6
- '@babel/plugin-syntax-typescript': 7.24.6(@babel/core@7.24.5)
-
- '@babel/preset-typescript@7.24.6(@babel/core@7.24.5)':
- dependencies:
- '@babel/core': 7.24.5
- '@babel/helper-plugin-utils': 7.24.6
- '@babel/helper-validator-option': 7.24.6
- '@babel/plugin-syntax-jsx': 7.24.6(@babel/core@7.24.5)
- '@babel/plugin-transform-modules-commonjs': 7.24.6(@babel/core@7.24.5)
- '@babel/plugin-transform-typescript': 7.24.6(@babel/core@7.24.5)
-
- '@babel/register@7.24.6(@babel/core@7.24.5)':
- dependencies:
- '@babel/core': 7.24.5
- clone-deep: 4.0.1
- find-cache-dir: 2.1.0
- make-dir: 2.1.0
- pirates: 4.0.6
- source-map-support: 0.5.21
-
'@babel/runtime@7.24.5':
dependencies:
regenerator-runtime: 0.14.1
@@ -5968,12 +5186,6 @@ snapshots:
'@babel/parser': 7.24.5
'@babel/types': 7.24.5
- '@babel/template@7.24.6':
- dependencies:
- '@babel/code-frame': 7.24.6
- '@babel/parser': 7.24.6
- '@babel/types': 7.24.6
-
'@babel/traverse@7.24.5':
dependencies:
'@babel/code-frame': 7.24.2
@@ -5984,7 +5196,7 @@ snapshots:
'@babel/helper-split-export-declaration': 7.24.5
'@babel/parser': 7.24.5
'@babel/types': 7.24.5
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
globals: 11.12.0
transitivePeerDependencies:
- supports-color
@@ -5995,17 +5207,11 @@ snapshots:
'@babel/helper-validator-identifier': 7.24.5
to-fast-properties: 2.0.0
- '@babel/types@7.24.6':
- dependencies:
- '@babel/helper-string-parser': 7.24.6
- '@babel/helper-validator-identifier': 7.24.6
- to-fast-properties: 2.0.0
-
- '@commitlint/cli@19.3.0(@types/node@20.12.13)(typescript@5.4.5)':
+ '@commitlint/cli@19.3.0(@types/node@20.14.2)(typescript@5.4.5)':
dependencies:
'@commitlint/format': 19.3.0
'@commitlint/lint': 19.2.2
- '@commitlint/load': 19.2.0(@types/node@20.12.13)(typescript@5.4.5)
+ '@commitlint/load': 19.2.0(@types/node@20.14.2)(typescript@5.4.5)
'@commitlint/read': 19.2.1
'@commitlint/types': 19.0.3
execa: 8.0.1
@@ -6052,7 +5258,7 @@ snapshots:
'@commitlint/rules': 19.0.3
'@commitlint/types': 19.0.3
- '@commitlint/load@19.2.0(@types/node@20.12.13)(typescript@5.4.5)':
+ '@commitlint/load@19.2.0(@types/node@20.14.2)(typescript@5.4.5)':
dependencies:
'@commitlint/config-validator': 19.0.3
'@commitlint/execute-rule': 19.0.0
@@ -6060,7 +5266,7 @@ snapshots:
'@commitlint/types': 19.0.3
chalk: 5.3.0
cosmiconfig: 9.0.0(typescript@5.4.5)
- cosmiconfig-typescript-loader: 5.0.0(@types/node@20.12.13)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5)
+ cosmiconfig-typescript-loader: 5.0.0(@types/node@20.14.2)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5)
lodash.isplainobject: 4.0.6
lodash.merge: 4.6.2
lodash.uniq: 4.5.0
@@ -6160,7 +5366,7 @@ snapshots:
'@electron/get@2.0.3':
dependencies:
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
env-paths: 2.2.1
fs-extra: 8.1.0
got: 11.8.6
@@ -6397,7 +5603,7 @@ snapshots:
'@eslint/eslintrc@2.1.4':
dependencies:
ajv: 6.12.6
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
espree: 9.6.1
globals: 13.24.0
ignore: 5.3.1
@@ -6429,18 +5635,18 @@ snapshots:
'@floating-ui/utils@0.2.2': {}
- '@generouted/react-router@1.19.5(react-router-dom@6.23.1(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))':
+ '@generouted/react-router@1.19.5(react-router-dom@6.23.1(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))':
dependencies:
fast-glob: 3.3.2
- generouted: 1.19.5(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
+ generouted: 1.19.5(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))
react: 19.0.0-rc-9d4fba0788-20240530
react-router-dom: 6.23.1(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)
- vite: 5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
+ vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
'@humanwhocodes/config-array@0.11.14':
dependencies:
'@humanwhocodes/object-schema': 2.0.3
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
minimatch: 3.1.2
transitivePeerDependencies:
- supports-color
@@ -6479,25 +5685,9 @@ snapshots:
'@material/material-color-utilities@0.2.7': {}
- '@mnajdova/enzyme-adapter-react-18@0.2.0(enzyme@3.11.0)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)':
- dependencies:
- enzyme: 3.11.0
- enzyme-adapter-utils: 1.14.2(react@19.0.0-rc-9d4fba0788-20240530)
- enzyme-shallow-equal: 1.0.7
- has: 1.0.4
- object.assign: 4.1.5
- object.values: 1.2.0
- prop-types: 15.8.1
- react: 19.0.0-rc-9d4fba0788-20240530
- react-dom: 19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530)
- react-is: 18.3.1
- react-reconciler: 0.29.2(react@19.0.0-rc-9d4fba0788-20240530)
- react-test-renderer: 18.3.1(react@19.0.0-rc-9d4fba0788-20240530)
- semver: 5.7.2
-
'@mui/base@5.0.0-beta.40(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)':
dependencies:
- '@babel/runtime': 7.24.5
+ '@babel/runtime': 7.24.6
'@floating-ui/react-dom': 2.0.9(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)
'@mui/types': 7.2.14(types-react@19.0.0-rc.0)
'@mui/utils': 5.15.14(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
@@ -6511,7 +5701,7 @@ snapshots:
'@mui/core-downloads-tracker@5.15.19': {}
- '@mui/icons-material@5.15.19(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)':
+ '@mui/icons-material@5.15.19(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)':
dependencies:
'@babel/runtime': 7.24.5
'@mui/material': 5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
@@ -6519,40 +5709,6 @@ snapshots:
optionalDependencies:
'@types/react': types-react@19.0.0-rc.0
- '@mui/internal-test-utils@1.0.0-dev.20240529-082515-213b5e33ab(@babel/core@7.24.5)(bufferutil@4.0.8)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)(utf-8-validate@5.0.10)':
- dependencies:
- '@babel/plugin-transform-modules-commonjs': 7.24.6(@babel/core@7.24.5)
- '@babel/preset-typescript': 7.24.6(@babel/core@7.24.5)
- '@babel/register': 7.24.6(@babel/core@7.24.5)
- '@babel/runtime': 7.24.6
- '@emotion/cache': 11.11.0
- '@emotion/react': 11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
- '@mnajdova/enzyme-adapter-react-18': 0.2.0(enzyme@3.11.0)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)
- '@testing-library/dom': 10.1.0
- '@testing-library/react': 15.0.7(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
- chai: 4.4.1
- chai-dom: 1.12.0(chai@4.4.1)
- dom-accessibility-api: 0.6.3
- enzyme: 3.11.0
- format-util: 1.0.5
- fs-extra: 11.2.0
- jsdom: 24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10)
- lodash: 4.17.21
- mocha: 10.4.0
- playwright: 1.44.1
- prop-types: 15.8.1
- react: 19.0.0-rc-9d4fba0788-20240530
- react-dom: 19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530)
- react-test-renderer: 18.3.1(react@19.0.0-rc-9d4fba0788-20240530)
- sinon: 16.1.3
- transitivePeerDependencies:
- - '@babel/core'
- - '@types/react'
- - bufferutil
- - canvas
- - supports-color
- - utf-8-validate
-
'@mui/lab@5.0.0-alpha.170(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)':
dependencies:
'@babel/runtime': 7.24.5
@@ -6593,7 +5749,7 @@ snapshots:
'@mui/private-theming@5.15.14(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)':
dependencies:
- '@babel/runtime': 7.24.5
+ '@babel/runtime': 7.24.6
'@mui/utils': 5.15.14(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
prop-types: 15.8.1
react: 19.0.0-rc-9d4fba0788-20240530
@@ -6602,7 +5758,7 @@ snapshots:
'@mui/styled-engine@5.15.14(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)':
dependencies:
- '@babel/runtime': 7.24.5
+ '@babel/runtime': 7.24.6
'@emotion/cache': 11.11.0
csstype: 3.1.3
prop-types: 15.8.1
@@ -6613,7 +5769,7 @@ snapshots:
'@mui/system@5.15.15(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)':
dependencies:
- '@babel/runtime': 7.24.5
+ '@babel/runtime': 7.24.6
'@mui/private-theming': 5.15.14(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
'@mui/styled-engine': 5.15.14(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)
'@mui/types': 7.2.14(types-react@19.0.0-rc.0)
@@ -6633,7 +5789,7 @@ snapshots:
'@mui/utils@5.15.14(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)':
dependencies:
- '@babel/runtime': 7.24.5
+ '@babel/runtime': 7.24.6
'@types/prop-types': 15.7.12
prop-types: 15.8.1
react: 19.0.0-rc-9d4fba0788-20240530
@@ -6641,10 +5797,9 @@ snapshots:
optionalDependencies:
'@types/react': types-react@19.0.0-rc.0
- '@mui/x-data-grid@7.6.0(@babel/core@7.24.5)(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(bufferutil@4.0.8)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)(utf-8-validate@5.0.10)':
+ '@mui/x-data-grid@7.6.2(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)':
dependencies:
'@babel/runtime': 7.24.6
- '@mui/internal-test-utils': 1.0.0-dev.20240529-082515-213b5e33ab(@babel/core@7.24.5)(bufferutil@4.0.8)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)(utf-8-validate@5.0.10)
'@mui/material': 5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
'@mui/system': 5.15.15(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
'@mui/utils': 5.15.14(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
@@ -6654,14 +5809,9 @@ snapshots:
react-dom: 19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530)
reselect: 4.1.8
transitivePeerDependencies:
- - '@babel/core'
- '@emotion/react'
- '@emotion/styled'
- '@types/react'
- - bufferutil
- - canvas
- - supports-color
- - utf-8-validate
'@nodelib/fs.scandir@2.1.5':
dependencies:
@@ -6798,34 +5948,10 @@ snapshots:
'@rollup/rollup-win32-x64-msvc@4.17.2':
optional: true
- '@shikijs/core@1.6.1': {}
+ '@shikijs/core@1.6.2': {}
'@sindresorhus/is@4.6.0': {}
- '@sinonjs/commons@2.0.0':
- dependencies:
- type-detect: 4.0.8
-
- '@sinonjs/commons@3.0.1':
- dependencies:
- type-detect: 4.0.8
-
- '@sinonjs/fake-timers@10.3.0':
- dependencies:
- '@sinonjs/commons': 3.0.1
-
- '@sinonjs/fake-timers@11.2.2':
- dependencies:
- '@sinonjs/commons': 3.0.1
-
- '@sinonjs/samsam@8.0.0':
- dependencies:
- '@sinonjs/commons': 2.0.0
- lodash.get: 4.4.2
- type-detect: 4.0.8
-
- '@sinonjs/text-encoding@0.7.2': {}
-
'@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.24.5)':
dependencies:
'@babel/core': 7.24.5
@@ -6951,33 +6077,10 @@ snapshots:
'@tauri-apps/cli-win32-ia32-msvc': 1.5.14
'@tauri-apps/cli-win32-x64-msvc': 1.5.14
- '@testing-library/dom@10.1.0':
- dependencies:
- '@babel/code-frame': 7.24.2
- '@babel/runtime': 7.24.6
- '@types/aria-query': 5.0.4
- aria-query: 5.3.0
- chalk: 4.1.2
- dom-accessibility-api: 0.5.16
- lz-string: 1.5.0
- pretty-format: 27.5.1
-
- '@testing-library/react@15.0.7(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)':
- dependencies:
- '@babel/runtime': 7.24.6
- '@testing-library/dom': 10.1.0
- '@types/react-dom': types-react-dom@19.0.0-rc.0
- react: 19.0.0-rc-9d4fba0788-20240530
- react-dom: 19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530)
- optionalDependencies:
- '@types/react': types-react@19.0.0-rc.0
-
'@types/adm-zip@0.5.5':
dependencies:
'@types/node': 20.12.10
- '@types/aria-query@5.0.4': {}
-
'@types/babel__core@7.20.5':
dependencies:
'@babel/parser': 7.24.5
@@ -7003,12 +6106,12 @@ snapshots:
dependencies:
'@types/http-cache-semantics': 4.0.4
'@types/keyv': 3.1.4
- '@types/node': 20.12.13
+ '@types/node': 20.14.2
'@types/responselike': 1.0.3
'@types/conventional-commits-parser@5.0.0':
dependencies:
- '@types/node': 20.12.13
+ '@types/node': 20.14.2
'@types/debug@4.1.12':
dependencies:
@@ -7025,7 +6128,7 @@ snapshots:
'@types/fs-extra@11.0.4':
dependencies:
'@types/jsonfile': 6.1.4
- '@types/node': 20.12.13
+ '@types/node': 20.14.2
'@types/hast@3.0.4':
dependencies:
@@ -7039,11 +6142,11 @@ snapshots:
'@types/jsonfile@6.1.4':
dependencies:
- '@types/node': 20.12.13
+ '@types/node': 20.14.2
'@types/keyv@3.1.4':
dependencies:
- '@types/node': 20.12.13
+ '@types/node': 20.14.2
'@types/lodash-es@4.17.12':
dependencies:
@@ -7063,7 +6166,7 @@ snapshots:
dependencies:
undici-types: 5.26.5
- '@types/node@20.12.13':
+ '@types/node@20.14.2':
dependencies:
undici-types: 5.26.5
@@ -7085,7 +6188,7 @@ snapshots:
'@types/responselike@1.0.3':
dependencies:
- '@types/node': 20.12.13
+ '@types/node': 20.14.2
'@types/unist@2.0.10': {}
@@ -7093,17 +6196,17 @@ snapshots:
'@types/yauzl@2.10.3':
dependencies:
- '@types/node': 20.12.13
+ '@types/node': 20.14.2
optional: true
- '@typescript-eslint/eslint-plugin@7.11.0(@typescript-eslint/parser@7.11.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)':
+ '@typescript-eslint/eslint-plugin@7.12.0(@typescript-eslint/parser@7.12.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)':
dependencies:
'@eslint-community/regexpp': 4.10.0
- '@typescript-eslint/parser': 7.11.0(eslint@8.57.0)(typescript@5.4.5)
- '@typescript-eslint/scope-manager': 7.11.0
- '@typescript-eslint/type-utils': 7.11.0(eslint@8.57.0)(typescript@5.4.5)
- '@typescript-eslint/utils': 7.11.0(eslint@8.57.0)(typescript@5.4.5)
- '@typescript-eslint/visitor-keys': 7.11.0
+ '@typescript-eslint/parser': 7.12.0(eslint@8.57.0)(typescript@5.4.5)
+ '@typescript-eslint/scope-manager': 7.12.0
+ '@typescript-eslint/type-utils': 7.12.0(eslint@8.57.0)(typescript@5.4.5)
+ '@typescript-eslint/utils': 7.12.0(eslint@8.57.0)(typescript@5.4.5)
+ '@typescript-eslint/visitor-keys': 7.12.0
eslint: 8.57.0
graphemer: 1.4.0
ignore: 5.3.1
@@ -7114,29 +6217,29 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/parser@7.11.0(eslint@8.57.0)(typescript@5.4.5)':
+ '@typescript-eslint/parser@7.12.0(eslint@8.57.0)(typescript@5.4.5)':
dependencies:
- '@typescript-eslint/scope-manager': 7.11.0
- '@typescript-eslint/types': 7.11.0
- '@typescript-eslint/typescript-estree': 7.11.0(typescript@5.4.5)
- '@typescript-eslint/visitor-keys': 7.11.0
- debug: 4.3.4(supports-color@8.1.1)
+ '@typescript-eslint/scope-manager': 7.12.0
+ '@typescript-eslint/types': 7.12.0
+ '@typescript-eslint/typescript-estree': 7.12.0(typescript@5.4.5)
+ '@typescript-eslint/visitor-keys': 7.12.0
+ debug: 4.3.4
eslint: 8.57.0
optionalDependencies:
typescript: 5.4.5
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/scope-manager@7.11.0':
+ '@typescript-eslint/scope-manager@7.12.0':
dependencies:
- '@typescript-eslint/types': 7.11.0
- '@typescript-eslint/visitor-keys': 7.11.0
+ '@typescript-eslint/types': 7.12.0
+ '@typescript-eslint/visitor-keys': 7.12.0
- '@typescript-eslint/type-utils@7.11.0(eslint@8.57.0)(typescript@5.4.5)':
+ '@typescript-eslint/type-utils@7.12.0(eslint@8.57.0)(typescript@5.4.5)':
dependencies:
- '@typescript-eslint/typescript-estree': 7.11.0(typescript@5.4.5)
- '@typescript-eslint/utils': 7.11.0(eslint@8.57.0)(typescript@5.4.5)
- debug: 4.3.4(supports-color@8.1.1)
+ '@typescript-eslint/typescript-estree': 7.12.0(typescript@5.4.5)
+ '@typescript-eslint/utils': 7.12.0(eslint@8.57.0)(typescript@5.4.5)
+ debug: 4.3.4
eslint: 8.57.0
ts-api-utils: 1.3.0(typescript@5.4.5)
optionalDependencies:
@@ -7144,13 +6247,13 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/types@7.11.0': {}
+ '@typescript-eslint/types@7.12.0': {}
- '@typescript-eslint/typescript-estree@7.11.0(typescript@5.4.5)':
+ '@typescript-eslint/typescript-estree@7.12.0(typescript@5.4.5)':
dependencies:
- '@typescript-eslint/types': 7.11.0
- '@typescript-eslint/visitor-keys': 7.11.0
- debug: 4.3.4(supports-color@8.1.1)
+ '@typescript-eslint/types': 7.12.0
+ '@typescript-eslint/visitor-keys': 7.12.0
+ debug: 4.3.4
globby: 11.1.0
is-glob: 4.0.3
minimatch: 9.0.4
@@ -7161,32 +6264,32 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@typescript-eslint/utils@7.11.0(eslint@8.57.0)(typescript@5.4.5)':
+ '@typescript-eslint/utils@7.12.0(eslint@8.57.0)(typescript@5.4.5)':
dependencies:
'@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0)
- '@typescript-eslint/scope-manager': 7.11.0
- '@typescript-eslint/types': 7.11.0
- '@typescript-eslint/typescript-estree': 7.11.0(typescript@5.4.5)
+ '@typescript-eslint/scope-manager': 7.12.0
+ '@typescript-eslint/types': 7.12.0
+ '@typescript-eslint/typescript-estree': 7.12.0(typescript@5.4.5)
eslint: 8.57.0
transitivePeerDependencies:
- supports-color
- typescript
- '@typescript-eslint/visitor-keys@7.11.0':
+ '@typescript-eslint/visitor-keys@7.12.0':
dependencies:
- '@typescript-eslint/types': 7.11.0
+ '@typescript-eslint/types': 7.12.0
eslint-visitor-keys: 3.4.3
'@ungap/structured-clone@1.2.0': {}
- '@vitejs/plugin-react@4.3.0(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))':
+ '@vitejs/plugin-react@4.3.0(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0))':
dependencies:
'@babel/core': 7.24.5
'@babel/plugin-transform-react-jsx-self': 7.24.5(@babel/core@7.24.5)
'@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.5)
'@types/babel__core': 7.20.5
react-refresh: 0.14.2
- vite: 5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
+ vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
transitivePeerDependencies:
- supports-color
@@ -7201,17 +6304,17 @@ snapshots:
acorn@8.11.3: {}
- adm-zip@0.5.12: {}
+ adm-zip@0.5.14: {}
agent-base@7.1.1:
dependencies:
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
transitivePeerDependencies:
- supports-color
ahooks@3.8.0(react@19.0.0-rc-9d4fba0788-20240530):
dependencies:
- '@babel/runtime': 7.24.5
+ '@babel/runtime': 7.24.6
dayjs: 1.11.11
intersection-observer: 0.12.2
js-cookie: 2.2.1
@@ -7222,19 +6325,6 @@ snapshots:
screenfull: 5.2.0
tslib: 2.6.2
- airbnb-prop-types@2.16.0(react@19.0.0-rc-9d4fba0788-20240530):
- dependencies:
- array.prototype.find: 2.2.3
- function.prototype.name: 1.1.6
- is-regex: 1.1.4
- object-is: 1.1.6
- object.assign: 4.1.5
- object.entries: 1.1.8
- prop-types: 15.8.1
- prop-types-exact: 1.2.4
- react: 19.0.0-rc-9d4fba0788-20240530
- react-is: 16.13.1
-
ajv@6.12.6:
dependencies:
fast-deep-equal: 3.1.3
@@ -7264,8 +6354,6 @@ snapshots:
dependencies:
string-width: 2.1.1
- ansi-colors@4.1.1: {}
-
ansi-escapes@6.2.1: {}
ansi-regex@3.0.1: {}
@@ -7282,8 +6370,6 @@ snapshots:
dependencies:
color-convert: 2.0.1
- ansi-styles@5.2.0: {}
-
ansi-styles@6.2.1: {}
any-promise@1.3.0: {}
@@ -7297,10 +6383,6 @@ snapshots:
argparse@2.0.1: {}
- aria-query@5.3.0:
- dependencies:
- dequal: 2.0.3
-
array-buffer-byte-length@1.0.1:
dependencies:
call-bind: 1.0.7
@@ -7319,23 +6401,6 @@ snapshots:
array-union@2.1.0: {}
- array.prototype.filter@1.0.4:
- dependencies:
- call-bind: 1.0.7
- define-properties: 1.2.1
- es-abstract: 1.23.3
- es-array-method-boxes-properly: 1.0.0
- es-object-atoms: 1.0.0
- is-string: 1.0.7
-
- array.prototype.find@2.2.3:
- dependencies:
- call-bind: 1.0.7
- define-properties: 1.2.1
- es-abstract: 1.23.3
- es-object-atoms: 1.0.0
- es-shim-unscopables: 1.0.2
-
array.prototype.findlast@1.2.5:
dependencies:
call-bind: 1.0.7
@@ -7394,8 +6459,6 @@ snapshots:
is-array-buffer: 3.0.4
is-shared-array-buffer: 1.0.3
- assertion-error@1.1.0: {}
-
astral-regex@2.0.0: {}
async-mutex@0.3.2:
@@ -7428,7 +6491,7 @@ snapshots:
babel-plugin-macros@3.1.0:
dependencies:
- '@babel/runtime': 7.24.5
+ '@babel/runtime': 7.24.6
cosmiconfig: 7.1.0
resolve: 1.22.8
@@ -7446,8 +6509,6 @@ snapshots:
binary-extensions@2.3.0: {}
- boolbase@1.0.0: {}
-
boolean@3.2.0:
optional: true
@@ -7478,8 +6539,6 @@ snapshots:
dependencies:
fill-range: 7.1.1
- browser-stdout@1.3.1: {}
-
browserslist@4.23.0:
dependencies:
caniuse-lite: 1.0.30001616
@@ -7489,8 +6548,6 @@ snapshots:
buffer-crc32@0.2.13: {}
- buffer-from@1.1.2: {}
-
buffer@6.0.3:
dependencies:
base64-js: 1.5.1
@@ -7540,20 +6597,6 @@ snapshots:
ccount@2.0.1: {}
- chai-dom@1.12.0(chai@4.4.1):
- dependencies:
- chai: 4.4.1
-
- chai@4.4.1:
- dependencies:
- assertion-error: 1.1.0
- check-error: 1.0.3
- deep-eql: 4.1.3
- get-func-name: 2.0.2
- loupe: 2.3.7
- pathval: 1.1.1
- type-detect: 4.0.8
-
chalk@2.4.2:
dependencies:
ansi-styles: 3.2.1
@@ -7575,41 +6618,6 @@ snapshots:
character-reference-invalid@2.0.1: {}
- check-error@1.0.3:
- dependencies:
- get-func-name: 2.0.2
-
- cheerio-select@2.1.0:
- dependencies:
- boolbase: 1.0.0
- css-select: 5.1.0
- css-what: 6.1.0
- domelementtype: 2.3.0
- domhandler: 5.0.3
- domutils: 3.1.0
-
- cheerio@1.0.0-rc.12:
- dependencies:
- cheerio-select: 2.1.0
- dom-serializer: 2.0.0
- domhandler: 5.0.3
- domutils: 3.1.0
- htmlparser2: 8.0.2
- parse5: 7.1.2
- parse5-htmlparser2-tree-adapter: 7.0.0
-
- chokidar@3.5.3:
- dependencies:
- anymatch: 3.1.3
- braces: 3.0.3
- glob-parent: 5.1.2
- is-binary-path: 2.1.0
- is-glob: 4.0.3
- normalize-path: 3.0.0
- readdirp: 3.6.0
- optionalDependencies:
- fsevents: 2.3.3
-
chokidar@3.6.0:
dependencies:
anymatch: 3.1.3
@@ -7639,24 +6647,12 @@ snapshots:
client-only@0.0.1: {}
- cliui@7.0.4:
- dependencies:
- string-width: 4.2.3
- strip-ansi: 6.0.1
- wrap-ansi: 7.0.0
-
cliui@8.0.1:
dependencies:
string-width: 4.2.3
strip-ansi: 6.0.1
wrap-ansi: 7.0.0
- clone-deep@4.0.1:
- dependencies:
- is-plain-object: 2.0.4
- kind-of: 6.0.3
- shallow-clone: 3.0.1
-
clone-response@1.0.3:
dependencies:
mimic-response: 1.0.1
@@ -7689,12 +6685,8 @@ snapshots:
commander@12.1.0: {}
- commander@2.20.3: {}
-
commander@4.1.1: {}
- commondir@1.0.1: {}
-
compare-func@2.0.0:
dependencies:
array-ify: 1.0.0
@@ -7740,9 +6732,9 @@ snapshots:
dependencies:
is-what: 3.14.1
- cosmiconfig-typescript-loader@5.0.0(@types/node@20.12.13)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5):
+ cosmiconfig-typescript-loader@5.0.0(@types/node@20.14.2)(cosmiconfig@9.0.0(typescript@5.4.5))(typescript@5.4.5):
dependencies:
- '@types/node': 20.12.13
+ '@types/node': 20.14.2
cosmiconfig: 9.0.0(typescript@5.4.5)
jiti: 1.21.0
typescript: 5.4.5
@@ -7797,27 +6789,13 @@ snapshots:
css-functions-list@3.2.2: {}
- css-select@5.1.0:
- dependencies:
- boolbase: 1.0.0
- css-what: 6.1.0
- domhandler: 5.0.3
- domutils: 3.1.0
- nth-check: 2.1.1
-
css-tree@2.3.1:
dependencies:
mdn-data: 2.0.30
source-map-js: 1.2.0
- css-what@6.1.0: {}
-
cssesc@3.0.0: {}
- cssstyle@4.0.1:
- dependencies:
- rrweb-cssom: 0.6.0
-
csstype@3.1.3: {}
d@1.0.2:
@@ -7829,11 +6807,6 @@ snapshots:
data-uri-to-buffer@4.0.1: {}
- data-urls@5.0.0:
- dependencies:
- whatwg-mimetype: 4.0.0
- whatwg-url: 14.0.0
-
data-view-buffer@1.0.1:
dependencies:
call-bind: 1.0.7
@@ -7862,15 +6835,9 @@ snapshots:
dependencies:
ms: 2.1.3
- debug@4.3.4(supports-color@8.1.1):
+ debug@4.3.4:
dependencies:
ms: 2.1.2
- optionalDependencies:
- supports-color: 8.1.1
-
- decamelize@4.0.0: {}
-
- decimal.js@10.4.3: {}
decode-named-character-reference@1.0.2:
dependencies:
@@ -7884,10 +6851,6 @@ snapshots:
optionalDependencies:
babel-plugin-macros: 3.1.0
- deep-eql@4.1.3:
- dependencies:
- type-detect: 4.0.8
-
deep-extend@0.6.0: {}
deep-is@0.1.4: {}
@@ -7923,16 +6886,10 @@ snapshots:
didyoumean@1.2.2: {}
- diff@5.0.0: {}
-
- diff@5.2.0: {}
-
dir-glob@3.0.1:
dependencies:
path-type: 4.0.0
- discontinuous-range@1.0.0: {}
-
dlv@1.1.3: {}
doctrine@2.1.0:
@@ -7943,13 +6900,9 @@ snapshots:
dependencies:
esutils: 2.0.3
- dom-accessibility-api@0.5.16: {}
-
- dom-accessibility-api@0.6.3: {}
-
dom-helpers@5.2.1:
dependencies:
- '@babel/runtime': 7.24.5
+ '@babel/runtime': 7.24.6
csstype: 3.1.3
dom-serializer@1.4.1:
@@ -8031,47 +6984,6 @@ snapshots:
env-paths@2.2.1: {}
- enzyme-adapter-utils@1.14.2(react@19.0.0-rc-9d4fba0788-20240530):
- dependencies:
- airbnb-prop-types: 2.16.0(react@19.0.0-rc-9d4fba0788-20240530)
- function.prototype.name: 1.1.6
- hasown: 2.0.2
- object.assign: 4.1.5
- object.fromentries: 2.0.8
- prop-types: 15.8.1
- react: 19.0.0-rc-9d4fba0788-20240530
- semver: 6.3.1
-
- enzyme-shallow-equal@1.0.7:
- dependencies:
- hasown: 2.0.2
- object-is: 1.1.6
-
- enzyme@3.11.0:
- dependencies:
- array.prototype.flat: 1.3.2
- cheerio: 1.0.0-rc.12
- enzyme-shallow-equal: 1.0.7
- function.prototype.name: 1.1.6
- has: 1.0.4
- html-element-map: 1.3.1
- is-boolean-object: 1.1.2
- is-callable: 1.2.7
- is-number-object: 1.0.7
- is-regex: 1.1.4
- is-string: 1.0.7
- is-subset: 0.1.1
- lodash.escape: 4.0.1
- lodash.isequal: 4.5.0
- object-inspect: 1.13.1
- object-is: 1.1.6
- object.assign: 4.1.5
- object.entries: 1.1.8
- object.values: 1.2.0
- raf: 3.4.1
- rst-selector-parser: 2.2.3
- string.prototype.trim: 1.2.9
-
errno@0.1.8:
dependencies:
prr: 1.0.1
@@ -8130,8 +7042,6 @@ snapshots:
unbox-primitive: 1.0.2
which-typed-array: 1.1.15
- es-array-method-boxes-properly@1.0.0: {}
-
es-define-property@1.0.0:
dependencies:
get-intrinsic: 1.2.4
@@ -8342,10 +7252,10 @@ snapshots:
resolve: 1.22.8
semver: 7.6.1
- eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5):
+ eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.1):
dependencies:
eslint: 8.57.0
- prettier: 3.2.5
+ prettier: 3.3.1
prettier-linter-helpers: 1.0.0
synckit: 0.8.8
optionalDependencies:
@@ -8397,7 +7307,7 @@ snapshots:
ajv: 6.12.6
chalk: 4.1.2
cross-spawn: 7.0.3
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
doctrine: 3.0.0
escape-string-regexp: 4.0.0
eslint-scope: 7.2.2
@@ -8493,7 +7403,7 @@ snapshots:
extract-zip@2.0.1:
dependencies:
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
get-stream: 5.2.0
yauzl: 2.10.0
optionalDependencies:
@@ -8550,18 +7460,8 @@ snapshots:
dependencies:
to-regex-range: 5.0.1
- find-cache-dir@2.1.0:
- dependencies:
- commondir: 1.0.1
- make-dir: 2.1.0
- pkg-dir: 3.0.0
-
find-root@1.1.0: {}
- find-up@3.0.0:
- dependencies:
- locate-path: 3.0.0
-
find-up@5.0.0:
dependencies:
locate-path: 6.0.0
@@ -8584,8 +7484,6 @@ snapshots:
flatted: 3.3.1
keyv: 4.5.4
- flat@5.0.2: {}
-
flatted@3.3.1: {}
follow-redirects@1.15.6: {}
@@ -8605,15 +7503,13 @@ snapshots:
combined-stream: 1.0.8
mime-types: 2.1.35
- format-util@1.0.5: {}
-
formdata-polyfill@4.0.10:
dependencies:
fetch-blob: 3.2.0
fraction.js@4.3.7: {}
- framer-motion@11.2.9(@emotion/is-prop-valid@1.2.2)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530):
+ framer-motion@11.2.10(@emotion/is-prop-valid@1.2.2)(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530):
dependencies:
tslib: 2.6.2
optionalDependencies:
@@ -8635,9 +7531,6 @@ snapshots:
fs.realpath@1.0.0: {}
- fsevents@2.3.2:
- optional: true
-
fsevents@2.3.3:
optional: true
@@ -8652,9 +7545,9 @@ snapshots:
functions-have-names@1.2.3: {}
- generouted@1.19.5(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)):
+ generouted@1.19.5(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)):
dependencies:
- vite: 5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
+ vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
gensync@1.0.0-beta.2: {}
@@ -8662,8 +7555,6 @@ snapshots:
get-east-asian-width@1.2.0: {}
- get-func-name@2.0.2: {}
-
get-intrinsic@1.2.4:
dependencies:
es-errors: 1.3.0
@@ -8725,14 +7616,6 @@ snapshots:
once: 1.4.0
path-is-absolute: 1.0.1
- glob@8.1.0:
- dependencies:
- fs.realpath: 1.0.0
- inflight: 1.0.6
- inherits: 2.0.4
- minimatch: 5.0.1
- once: 1.4.0
-
global-agent@3.0.0:
dependencies:
boolean: 3.2.0
@@ -8841,8 +7724,6 @@ snapshots:
dependencies:
has-symbols: 1.0.3
- has@1.0.4: {}
-
hasown@2.0.2:
dependencies:
function-bind: 1.1.2
@@ -8871,21 +7752,10 @@ snapshots:
dependencies:
'@types/hast': 3.0.4
- he@1.2.0: {}
-
hoist-non-react-statics@3.3.2:
dependencies:
react-is: 16.13.1
- html-element-map@1.3.1:
- dependencies:
- array.prototype.filter: 1.0.4
- call-bind: 1.0.7
-
- html-encoding-sniffer@4.0.0:
- dependencies:
- whatwg-encoding: 3.1.1
-
html-parse-stringify@3.0.1:
dependencies:
void-elements: 3.1.0
@@ -8917,13 +7787,6 @@ snapshots:
http-cache-semantics@4.1.1: {}
- http-proxy-agent@7.0.2:
- dependencies:
- agent-base: 7.1.1
- debug: 4.3.4(supports-color@8.1.1)
- transitivePeerDependencies:
- - supports-color
-
http2-wrapper@1.0.3:
dependencies:
quick-lru: 5.1.1
@@ -8932,7 +7795,7 @@ snapshots:
https-proxy-agent@7.0.4:
dependencies:
agent-base: 7.1.1
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
transitivePeerDependencies:
- supports-color
@@ -8947,6 +7810,7 @@ snapshots:
iconv-lite@0.6.3:
dependencies:
safer-buffer: 2.1.2
+ optional: true
icss-utils@5.1.0(postcss@8.4.38):
dependencies:
@@ -9108,18 +7972,10 @@ snapshots:
is-path-inside@3.0.3: {}
- is-plain-obj@2.1.0: {}
-
is-plain-obj@4.1.0: {}
- is-plain-object@2.0.4:
- dependencies:
- isobject: 3.0.1
-
is-plain-object@5.0.0: {}
- is-potential-custom-element-name@1.0.1: {}
-
is-redirect@1.0.0: {}
is-regex@1.1.4:
@@ -9143,8 +7999,6 @@ snapshots:
dependencies:
has-tostringtag: 1.0.2
- is-subset@0.1.1: {}
-
is-symbol@1.0.4:
dependencies:
has-symbols: 1.0.3
@@ -9159,8 +8013,6 @@ snapshots:
is-typedarray@1.0.0: {}
- is-unicode-supported@0.1.0: {}
-
is-weakmap@2.0.2: {}
is-weakref@1.0.2:
@@ -9178,8 +8030,6 @@ snapshots:
isexe@2.0.0: {}
- isobject@3.0.1: {}
-
iterator.prototype@1.1.2:
dependencies:
define-properties: 1.2.1
@@ -9196,7 +8046,7 @@ snapshots:
jiti@1.21.0: {}
- jotai@2.8.2(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0):
+ jotai@2.8.3(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0):
optionalDependencies:
'@types/react': types-react@19.0.0-rc.0
react: 19.0.0-rc-9d4fba0788-20240530
@@ -9213,34 +8063,6 @@ snapshots:
jsbn@1.1.0: {}
- jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@5.0.10):
- dependencies:
- cssstyle: 4.0.1
- data-urls: 5.0.0
- decimal.js: 10.4.3
- form-data: 4.0.0
- html-encoding-sniffer: 4.0.0
- http-proxy-agent: 7.0.2
- https-proxy-agent: 7.0.4
- is-potential-custom-element-name: 1.0.1
- nwsapi: 2.2.10
- parse5: 7.1.2
- rrweb-cssom: 0.7.0
- saxes: 6.0.0
- symbol-tree: 3.2.4
- tough-cookie: 4.1.4
- w3c-xmlserializer: 5.0.0
- webidl-conversions: 7.0.0
- whatwg-encoding: 3.1.1
- whatwg-mimetype: 4.0.0
- whatwg-url: 14.0.0
- ws: 8.17.0(bufferutil@4.0.8)(utf-8-validate@5.0.10)
- xml-name-validator: 5.0.0
- transitivePeerDependencies:
- - bufferutil
- - supports-color
- - utf-8-validate
-
jsesc@2.5.2: {}
json-buffer@3.0.1: {}
@@ -9283,16 +8105,12 @@ snapshots:
object.assign: 4.1.5
object.values: 1.2.0
- just-extend@6.2.0: {}
-
keyv@4.5.4:
dependencies:
json-buffer: 3.0.1
kind-of@6.0.3: {}
- known-css-properties@0.30.0: {}
-
known-css-properties@0.31.0: {}
latest-version@3.1.0:
@@ -9328,7 +8146,7 @@ snapshots:
dependencies:
chalk: 5.3.0
commander: 12.1.0
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
execa: 8.0.1
lilconfig: 3.1.1
listr2: 8.2.1
@@ -9348,11 +8166,6 @@ snapshots:
rfdc: 1.3.1
wrap-ansi: 9.0.0
- locate-path@3.0.0:
- dependencies:
- p-locate: 3.0.0
- path-exists: 3.0.0
-
locate-path@6.0.0:
dependencies:
p-locate: 5.0.0
@@ -9369,12 +8182,6 @@ snapshots:
lodash.debounce@4.0.8: {}
- lodash.escape@4.0.1: {}
-
- lodash.flattendeep@4.4.0: {}
-
- lodash.get@4.4.2: {}
-
lodash.isequal@4.5.0: {}
lodash.isplainobject@4.0.6: {}
@@ -9397,11 +8204,6 @@ snapshots:
lodash@4.17.21: {}
- log-symbols@4.1.0:
- dependencies:
- chalk: 4.1.2
- is-unicode-supported: 0.1.0
-
log-update@6.0.0:
dependencies:
ansi-escapes: 6.2.1
@@ -9416,10 +8218,6 @@ snapshots:
dependencies:
js-tokens: 4.0.0
- loupe@2.3.7:
- dependencies:
- get-func-name: 2.0.2
-
lower-case@2.0.2:
dependencies:
tslib: 2.6.2
@@ -9439,8 +8237,6 @@ snapshots:
dependencies:
yallist: 3.1.1
- lz-string@1.5.0: {}
-
make-dir@1.3.0:
dependencies:
pify: 3.0.0
@@ -9449,6 +8245,7 @@ snapshots:
dependencies:
pify: 4.0.1
semver: 5.7.2
+ optional: true
matcher@3.0.0:
dependencies:
@@ -9672,7 +8469,7 @@ snapshots:
micromark@4.0.0:
dependencies:
'@types/debug': 4.1.12
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
decode-named-character-reference: 1.0.2
devlop: 1.1.0
micromark-core-commonmark: 2.0.1
@@ -9724,10 +8521,6 @@ snapshots:
dependencies:
brace-expansion: 1.1.11
- minimatch@5.0.1:
- dependencies:
- brace-expansion: 2.0.1
-
minimatch@9.0.4:
dependencies:
brace-expansion: 2.0.1
@@ -9736,33 +8529,8 @@ snapshots:
minipass@7.1.0: {}
- mocha@10.4.0:
- dependencies:
- ansi-colors: 4.1.1
- browser-stdout: 1.3.1
- chokidar: 3.5.3
- debug: 4.3.4(supports-color@8.1.1)
- diff: 5.0.0
- escape-string-regexp: 4.0.0
- find-up: 5.0.0
- glob: 8.1.0
- he: 1.2.0
- js-yaml: 4.1.0
- log-symbols: 4.1.0
- minimatch: 5.0.1
- ms: 2.1.3
- serialize-javascript: 6.0.0
- strip-json-comments: 3.1.1
- supports-color: 8.1.1
- workerpool: 6.2.1
- yargs: 16.2.0
- yargs-parser: 20.2.4
- yargs-unparser: 2.0.0
-
monaco-editor@0.49.0: {}
- moo@0.5.2: {}
-
ms@2.0.0: {}
ms@2.1.2: {}
@@ -9790,13 +8558,6 @@ snapshots:
natural-compare@1.4.0: {}
- nearley@2.20.1:
- dependencies:
- commander: 2.20.3
- moo: 0.5.2
- railroad-diagrams: 1.0.0
- randexp: 0.4.6
-
needle@3.3.1:
dependencies:
iconv-lite: 0.6.3
@@ -9805,14 +8566,6 @@ snapshots:
next-tick@1.1.0: {}
- nise@5.1.9:
- dependencies:
- '@sinonjs/commons': 3.0.1
- '@sinonjs/fake-timers': 11.2.2
- '@sinonjs/text-encoding': 0.7.2
- just-extend: 6.2.0
- path-to-regexp: 6.2.2
-
no-case@3.0.4:
dependencies:
lower-case: 2.0.2
@@ -9862,23 +8615,12 @@ snapshots:
dependencies:
path-key: 4.0.0
- nth-check@2.1.1:
- dependencies:
- boolbase: 1.0.0
-
- nwsapi@2.2.10: {}
-
object-assign@4.1.1: {}
object-hash@3.0.0: {}
object-inspect@1.13.1: {}
- object-is@1.1.6:
- dependencies:
- call-bind: 1.0.7
- define-properties: 1.2.1
-
object-keys@1.1.1: {}
object.assign@4.1.5:
@@ -9950,10 +8692,6 @@ snapshots:
p-finally@1.0.0: {}
- p-limit@2.3.0:
- dependencies:
- p-try: 2.2.0
-
p-limit@3.1.0:
dependencies:
yocto-queue: 0.1.0
@@ -9962,10 +8700,6 @@ snapshots:
dependencies:
yocto-queue: 1.0.0
- p-locate@3.0.0:
- dependencies:
- p-limit: 2.3.0
-
p-locate@5.0.0:
dependencies:
p-limit: 3.1.0
@@ -9974,8 +8708,6 @@ snapshots:
dependencies:
p-limit: 4.0.0
- p-try@2.2.0: {}
-
package-json@4.0.1:
dependencies:
got: 6.7.1
@@ -10009,19 +8741,8 @@ snapshots:
parse-node-version@1.0.1: {}
- parse5-htmlparser2-tree-adapter@7.0.0:
- dependencies:
- domhandler: 5.0.3
- parse5: 7.1.2
-
- parse5@7.1.2:
- dependencies:
- entities: 4.5.0
-
path-browserify@1.0.1: {}
- path-exists@3.0.0: {}
-
path-exists@4.0.0: {}
path-exists@5.0.0: {}
@@ -10043,16 +8764,10 @@ snapshots:
lru-cache: 10.2.2
minipass: 7.1.0
- path-to-regexp@6.2.2: {}
-
path-type@4.0.0: {}
- pathval@1.1.1: {}
-
pend@1.2.0: {}
- performance-now@2.1.0: {}
-
picocolors@1.0.1: {}
picomatch@2.3.1: {}
@@ -10063,22 +8778,11 @@ snapshots:
pify@3.0.0: {}
- pify@4.0.1: {}
+ pify@4.0.1:
+ optional: true
pirates@4.0.6: {}
- pkg-dir@3.0.0:
- dependencies:
- find-up: 3.0.0
-
- playwright-core@1.44.1: {}
-
- playwright@1.44.1:
- dependencies:
- playwright-core: 1.44.1
- optionalDependencies:
- fsevents: 2.3.2
-
possible-typed-array-names@1.0.0: {}
postcss-html@1.7.0:
@@ -10188,29 +8892,15 @@ snapshots:
dependencies:
fast-diff: 1.3.0
- prettier-plugin-toml@2.0.1(prettier@3.2.5):
+ prettier-plugin-toml@2.0.1(prettier@3.3.1):
dependencies:
'@taplo/lib': 0.4.0-alpha.2
- prettier: 3.2.5
+ prettier: 3.3.1
- prettier@3.2.5: {}
-
- pretty-format@27.5.1:
- dependencies:
- ansi-regex: 5.0.1
- ansi-styles: 5.2.0
- react-is: 17.0.2
+ prettier@3.3.1: {}
progress@2.0.3: {}
- prop-types-exact@1.2.4:
- dependencies:
- es-errors: 1.3.0
- hasown: 2.0.2
- isarray: 2.0.5
- object.assign: 4.1.5
- reflect.ownkeys: 1.1.4
-
prop-types@15.8.1:
dependencies:
loose-envify: 1.4.0
@@ -10226,8 +8916,6 @@ snapshots:
pseudomap@1.0.2: {}
- psl@1.9.0: {}
-
pump@3.0.0:
dependencies:
end-of-stream: 1.4.4
@@ -10235,27 +8923,10 @@ snapshots:
punycode@2.3.1: {}
- querystringify@2.2.0: {}
-
queue-microtask@1.2.3: {}
quick-lru@5.1.1: {}
- raf@3.4.1:
- dependencies:
- performance-now: 2.1.0
-
- railroad-diagrams@1.0.0: {}
-
- randexp@0.4.6:
- dependencies:
- discontinuous-range: 1.0.0
- ret: 0.1.15
-
- randombytes@2.1.0:
- dependencies:
- safe-buffer: 5.2.1
-
rc@1.2.8:
dependencies:
deep-extend: 0.6.0
@@ -10307,7 +8978,7 @@ snapshots:
react: 19.0.0-rc-9d4fba0788-20240530
react-hook-form: 7.51.5(react@19.0.0-rc-9d4fba0788-20240530)
optionalDependencies:
- '@mui/icons-material': 5.15.19(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
+ '@mui/icons-material': 5.15.19(@mui/material@5.15.19(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0))(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0)
react-hook-form@7.51.5(react@19.0.0-rc-9d4fba0788-20240530):
dependencies:
@@ -10324,8 +8995,6 @@ snapshots:
react-is@16.13.1: {}
- react-is@17.0.2: {}
-
react-is@18.3.1: {}
react-markdown@9.0.1(react@19.0.0-rc-9d4fba0788-20240530)(types-react@19.0.0-rc.0):
@@ -10345,12 +9014,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- react-reconciler@0.29.2(react@19.0.0-rc-9d4fba0788-20240530):
- dependencies:
- loose-envify: 1.4.0
- react: 19.0.0-rc-9d4fba0788-20240530
- scheduler: 0.23.2
-
react-refresh@0.14.2: {}
react-router-dom@6.23.1(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530):
@@ -10365,19 +9028,6 @@ snapshots:
'@remix-run/router': 1.16.1
react: 19.0.0-rc-9d4fba0788-20240530
- react-shallow-renderer@16.15.0(react@19.0.0-rc-9d4fba0788-20240530):
- dependencies:
- object-assign: 4.1.1
- react: 19.0.0-rc-9d4fba0788-20240530
- react-is: 18.3.1
-
- react-test-renderer@18.3.1(react@19.0.0-rc-9d4fba0788-20240530):
- dependencies:
- react: 19.0.0-rc-9d4fba0788-20240530
- react-is: 18.3.1
- react-shallow-renderer: 16.15.0(react@19.0.0-rc-9d4fba0788-20240530)
- scheduler: 0.23.2
-
react-transition-group@4.4.5(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530):
dependencies:
'@babel/runtime': 7.24.5
@@ -10419,14 +9069,6 @@ snapshots:
globalthis: 1.0.4
which-builtin-type: 1.1.3
- reflect.ownkeys@1.1.4:
- dependencies:
- call-bind: 1.0.7
- define-properties: 1.2.1
- es-abstract: 1.23.3
- es-set-tostringtag: 2.0.3
- globalthis: 1.0.4
-
regenerator-runtime@0.14.1: {}
regexp.prototype.flags@1.5.2:
@@ -10466,8 +9108,6 @@ snapshots:
require-from-string@2.0.2: {}
- requires-port@1.0.0: {}
-
reselect@4.1.8: {}
reserved-words@0.1.2: {}
@@ -10503,8 +9143,6 @@ snapshots:
onetime: 5.1.2
signal-exit: 3.0.7
- ret@0.1.15: {}
-
reusify@1.0.4: {}
rfdc@1.3.1: {}
@@ -10545,15 +9183,6 @@ snapshots:
'@rollup/rollup-win32-x64-msvc': 4.17.2
fsevents: 2.3.3
- rrweb-cssom@0.6.0: {}
-
- rrweb-cssom@0.7.0: {}
-
- rst-selector-parser@2.2.3:
- dependencies:
- lodash.flattendeep: 4.4.0
- nearley: 2.20.1
-
run-parallel@1.2.0:
dependencies:
queue-microtask: 1.2.3
@@ -10573,7 +9202,8 @@ snapshots:
es-errors: 1.3.0
is-regex: 1.1.4
- safer-buffer@2.1.2: {}
+ safer-buffer@2.1.2:
+ optional: true
sass@1.77.4:
dependencies:
@@ -10583,14 +9213,6 @@ snapshots:
sax@1.3.0: {}
- saxes@6.0.0:
- dependencies:
- xmlchars: 2.2.0
-
- scheduler@0.23.2:
- dependencies:
- loose-envify: 1.4.0
-
scheduler@0.25.0-rc-9d4fba0788-20240530: {}
screenfull@5.2.0: {}
@@ -10613,10 +9235,6 @@ snapshots:
type-fest: 0.13.1
optional: true
- serialize-javascript@6.0.0:
- dependencies:
- randombytes: 2.1.0
-
set-function-length@1.2.2:
dependencies:
define-data-property: 1.1.4
@@ -10633,10 +9251,6 @@ snapshots:
functions-have-names: 1.2.3
has-property-descriptors: 1.0.2
- shallow-clone@3.0.1:
- dependencies:
- kind-of: 6.0.3
-
shebang-command@1.2.0:
dependencies:
shebang-regex: 1.0.0
@@ -10651,9 +9265,9 @@ snapshots:
shell-quote@1.8.1: {}
- shiki@1.6.1:
+ shiki@1.6.2:
dependencies:
- '@shikijs/core': 1.6.1
+ '@shikijs/core': 1.6.2
side-channel@1.0.6:
dependencies:
@@ -10666,15 +9280,6 @@ snapshots:
signal-exit@4.1.0: {}
- sinon@16.1.3:
- dependencies:
- '@sinonjs/commons': 3.0.1
- '@sinonjs/fake-timers': 10.3.0
- '@sinonjs/samsam': 8.0.0
- diff: 5.2.0
- nise: 5.1.9
- supports-color: 7.2.0
-
slash@3.0.0: {}
slice-ansi@4.0.0:
@@ -10709,14 +9314,10 @@ snapshots:
source-map-js@1.2.0: {}
- source-map-support@0.5.21:
- dependencies:
- buffer-from: 1.1.2
- source-map: 0.6.1
-
source-map@0.5.7: {}
- source-map@0.6.1: {}
+ source-map@0.6.1:
+ optional: true
source-map@0.7.4: {}
@@ -10847,12 +9448,12 @@ snapshots:
postcss-sorting: 8.0.2(postcss@8.4.38)
stylelint: 16.6.1(typescript@5.4.5)
- stylelint-scss@6.3.0(stylelint@16.6.1(typescript@5.4.5)):
+ stylelint-scss@6.3.1(stylelint@16.6.1(typescript@5.4.5)):
dependencies:
- known-css-properties: 0.30.0
+ known-css-properties: 0.31.0
postcss-media-query-parser: 0.2.3
postcss-resolve-nested-selector: 0.1.1
- postcss-selector-parser: 6.0.16
+ postcss-selector-parser: 6.1.0
postcss-value-parser: 4.2.0
stylelint: 16.6.1(typescript@5.4.5)
@@ -10868,7 +9469,7 @@ snapshots:
cosmiconfig: 9.0.0(typescript@5.4.5)
css-functions-list: 3.2.2
css-tree: 2.3.1
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
fast-glob: 3.3.2
fastest-levenshtein: 1.0.16
file-entry-cache: 9.0.0
@@ -10906,7 +9507,7 @@ snapshots:
stylus@0.62.0:
dependencies:
'@adobe/css-tools': 4.3.3
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
glob: 7.2.3
sax: 1.3.0
source-map: 0.7.4
@@ -10925,7 +9526,7 @@ snapshots:
sumchecker@3.0.1:
dependencies:
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
transitivePeerDependencies:
- supports-color
@@ -10937,10 +9538,6 @@ snapshots:
dependencies:
has-flag: 4.0.0
- supports-color@8.1.1:
- dependencies:
- has-flag: 4.0.0
-
supports-hyperlinks@3.0.0:
dependencies:
has-flag: 4.0.0
@@ -10958,8 +9555,6 @@ snapshots:
react: 19.0.0-rc-9d4fba0788-20240530
use-sync-external-store: 1.2.2(react@19.0.0-rc-9d4fba0788-20240530)
- symbol-tree@3.2.4: {}
-
synckit@0.8.8:
dependencies:
'@pkgr/core': 0.1.1
@@ -10973,7 +9568,7 @@ snapshots:
string-width: 4.2.3
strip-ansi: 6.0.1
- tailwindcss@3.4.3:
+ tailwindcss@3.4.4:
dependencies:
'@alloc/quick-lru': 5.2.0
arg: 5.0.2
@@ -10985,7 +9580,7 @@ snapshots:
is-glob: 4.0.3
jiti: 1.21.0
lilconfig: 2.1.0
- micromatch: 4.0.5
+ micromatch: 4.0.7
normalize-path: 3.0.0
object-hash: 3.0.0
picocolors: 1.0.1
@@ -10994,13 +9589,13 @@ snapshots:
postcss-js: 4.0.1(postcss@8.4.38)
postcss-load-config: 4.0.2(postcss@8.4.38)
postcss-nested: 6.0.1(postcss@8.4.38)
- postcss-selector-parser: 6.0.16
+ postcss-selector-parser: 6.1.0
resolve: 1.22.8
sucrase: 3.35.0
transitivePeerDependencies:
- ts-node
- telegram@2.21.2:
+ telegram@2.22.2:
dependencies:
'@cryptography/aes': 0.1.1
async-mutex: 0.3.2
@@ -11048,17 +9643,6 @@ snapshots:
dependencies:
is-number: 7.0.0
- tough-cookie@4.1.4:
- dependencies:
- psl: 1.9.0
- punycode: 2.3.1
- universalify: 0.2.0
- url-parse: 1.5.10
-
- tr46@5.0.0:
- dependencies:
- punycode: 2.3.1
-
trim-lines@3.0.1: {}
trough@2.2.0: {}
@@ -11090,7 +9674,7 @@ snapshots:
tslib@2.6.2: {}
- tsx@4.11.0:
+ tsx@4.12.0:
dependencies:
esbuild: 0.20.2
get-tsconfig: 4.7.5
@@ -11103,8 +9687,6 @@ snapshots:
dependencies:
prelude-ls: 1.2.1
- type-detect@4.0.8: {}
-
type-fest@0.13.1:
optional: true
@@ -11244,8 +9826,6 @@ snapshots:
universalify@0.1.2: {}
- universalify@0.2.0: {}
-
universalify@2.0.1: {}
unzip-response@2.0.1: {}
@@ -11277,11 +9857,6 @@ snapshots:
dependencies:
prepend-http: 1.0.4
- url-parse@1.5.10:
- dependencies:
- querystringify: 2.2.0
- requires-port: 1.0.0
-
use-resize-observer@9.1.0(react-dom@19.0.0-rc-9d4fba0788-20240530(react@19.0.0-rc-9d4fba0788-20240530))(react@19.0.0-rc-9d4fba0788-20240530):
dependencies:
'@juggle/resize-observer': 3.4.0
@@ -11319,43 +9894,43 @@ snapshots:
esbuild: 0.19.12
monaco-editor: 0.49.0
- vite-plugin-sass-dts@1.3.22(postcss@8.4.38)(prettier@3.2.5)(sass@1.77.4)(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)):
+ vite-plugin-sass-dts@1.3.22(postcss@8.4.38)(prettier@3.3.1)(sass@1.77.4)(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)):
dependencies:
postcss: 8.4.38
postcss-js: 4.0.1(postcss@8.4.38)
- prettier: 3.2.5
+ prettier: 3.3.1
sass: 1.77.4
- vite: 5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
+ vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
- vite-plugin-svgr@4.2.0(rollup@4.17.2)(typescript@5.4.5)(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)):
+ vite-plugin-svgr@4.2.0(rollup@4.17.2)(typescript@5.4.5)(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)):
dependencies:
'@rollup/pluginutils': 5.1.0(rollup@4.17.2)
'@svgr/core': 8.1.0(typescript@5.4.5)
'@svgr/plugin-jsx': 8.1.0(@svgr/core@8.1.0(typescript@5.4.5))
- vite: 5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
+ vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
transitivePeerDependencies:
- rollup
- supports-color
- typescript
- vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)):
+ vite-tsconfig-paths@4.3.2(typescript@5.4.5)(vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)):
dependencies:
- debug: 4.3.4(supports-color@8.1.1)
+ debug: 4.3.4
globrex: 0.1.2
tsconfck: 3.0.3(typescript@5.4.5)
optionalDependencies:
- vite: 5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
+ vite: 5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0)
transitivePeerDependencies:
- supports-color
- typescript
- vite@5.2.12(@types/node@20.12.13)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0):
+ vite@5.2.12(@types/node@20.14.2)(less@4.2.0)(sass@1.77.4)(stylus@0.62.0):
dependencies:
esbuild: 0.20.2
postcss: 8.4.38
rollup: 4.17.2
optionalDependencies:
- '@types/node': 20.12.13
+ '@types/node': 20.14.2
fsevents: 2.3.3
less: 4.2.0
sass: 1.77.4
@@ -11363,14 +9938,8 @@ snapshots:
void-elements@3.1.0: {}
- w3c-xmlserializer@5.0.0:
- dependencies:
- xml-name-validator: 5.0.0
-
web-streams-polyfill@3.3.3: {}
- webidl-conversions@7.0.0: {}
-
websocket@1.0.35:
dependencies:
bufferutil: 4.0.8
@@ -11382,17 +9951,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
- whatwg-encoding@3.1.1:
- dependencies:
- iconv-lite: 0.6.3
-
- whatwg-mimetype@4.0.0: {}
-
- whatwg-url@14.0.0:
- dependencies:
- tr46: 5.0.0
- webidl-conversions: 7.0.0
-
which-boxed-primitive@1.0.2:
dependencies:
is-bigint: 1.0.4
@@ -11445,8 +10003,6 @@ snapshots:
word-wrap@1.2.5: {}
- workerpool@6.2.1: {}
-
wrap-ansi@7.0.0:
dependencies:
ansi-styles: 4.3.0
@@ -11489,17 +10045,8 @@ snapshots:
bufferutil: 4.0.8
utf-8-validate: 5.0.10
- ws@8.17.0(bufferutil@4.0.8)(utf-8-validate@5.0.10):
- optionalDependencies:
- bufferutil: 4.0.8
- utf-8-validate: 5.0.10
-
xdg-basedir@3.0.0: {}
- xml-name-validator@5.0.0: {}
-
- xmlchars@2.2.0: {}
-
y18n@5.0.8: {}
yaeti@0.0.6: {}
@@ -11512,27 +10059,8 @@ snapshots:
yaml@2.4.2: {}
- yargs-parser@20.2.4: {}
-
yargs-parser@21.1.1: {}
- yargs-unparser@2.0.0:
- dependencies:
- camelcase: 6.3.0
- decamelize: 4.0.0
- flat: 5.0.2
- is-plain-obj: 2.1.0
-
- yargs@16.2.0:
- dependencies:
- cliui: 7.0.4
- escalade: 3.1.2
- get-caller-file: 2.0.5
- require-directory: 2.1.1
- string-width: 4.2.3
- y18n: 5.0.8
- yargs-parser: 20.2.4
-
yargs@17.7.2:
dependencies:
cliui: 8.0.1
diff --git a/clash-nyanpasu/scripts/package.json b/clash-nyanpasu/scripts/package.json
index a33f3f6e4d..cdf222218b 100644
--- a/clash-nyanpasu/scripts/package.json
+++ b/clash-nyanpasu/scripts/package.json
@@ -8,13 +8,13 @@
},
"devDependencies": {
"@types/adm-zip": "0.5.5",
- "adm-zip": "0.5.12",
+ "adm-zip": "0.5.14",
"colorize-template": "1.0.0",
"consola": "3.2.3",
"fs-extra": "11.2.0",
"https-proxy-agent": "7.0.4",
"node-fetch": "3.3.2",
"picocolors": "1.0.1",
- "telegram": "2.21.2"
+ "telegram": "2.22.2"
}
}
diff --git a/clash-verge-rev/.github/build-for-linux/build.sh b/clash-verge-rev/.github/build-for-linux/build.sh
index 6389453346..0a7a4bc0ca 100644
--- a/clash-verge-rev/.github/build-for-linux/build.sh
+++ b/clash-verge-rev/.github/build-for-linux/build.sh
@@ -2,7 +2,7 @@ pnpm install
pnpm check $INPUT_TARGET
sed -i "s/#openssl/openssl={version=\"0.10\",features=[\"vendored\"]}/g" src-tauri/Cargo.toml
if [ "$INPUT_TARGET" = "x86_64-unknown-linux-gnu" ]; then
- pnpm build --target $INPUT_TARGET
+ cargo tauri build --target $INPUT_TARGET
else
- pnpm build --target $INPUT_TARGET -b deb
+ cargo tauri build --target $INPUT_TARGET -b deb,rpm
fi
diff --git a/clash-verge-rev/.github/build-for-linux/entrypoint.sh b/clash-verge-rev/.github/build-for-linux/entrypoint.sh
index c07360347e..c23f6217c2 100644
--- a/clash-verge-rev/.github/build-for-linux/entrypoint.sh
+++ b/clash-verge-rev/.github/build-for-linux/entrypoint.sh
@@ -5,6 +5,8 @@ tar -Jxvf ./node-v20.10.0-linux-x64.tar.xz
export PATH=$(pwd)/node-v20.10.0-linux-x64/bin:$PATH
npm install pnpm -g
+cargo install --git https://github.com/tauri-apps/tauri --branch 1.x tauri-cli
+
rustup target add "$INPUT_TARGET"
if [ "$INPUT_TARGET" = "x86_64-unknown-linux-gnu" ]; then
diff --git a/clash-verge-rev/.github/workflows/alpha.yml b/clash-verge-rev/.github/workflows/alpha.yml
index f393dcc330..5c5b6eae89 100644
--- a/clash-verge-rev/.github/workflows/alpha.yml
+++ b/clash-verge-rev/.github/workflows/alpha.yml
@@ -66,6 +66,12 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+ APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+ APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+ APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+ APPLE_ID: ${{ secrets.APPLE_ID }}
+ APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+ APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
with:
tagName: alpha
releaseName: "Clash Verge Rev Alpha"
@@ -134,7 +140,9 @@ jobs:
body: "More new features are now supported."
prerelease: true
token: ${{ secrets.GITHUB_TOKEN }}
- files: src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb
+ files: |
+ src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb
+ src-tauri/target/${{ matrix.target }}/release/bundle/rpm/*.rpm
alpha-for-fixed-webview2:
strategy:
@@ -248,12 +256,12 @@ jobs:
- MacOS apple M芯片: aarch64.dmg
### Linux
- - Linux 64位: amd64.AppImage/amd64.deb
- - Linux 32位: i386.deb
- - Linux arm64架构: arm64.deb
- - Linux armv7架构: armhf.deb
+ - Linux 64位: amd64.AppImage/amd64.deb/amd64.rpm
+ - Linux 32位: i386.deb/i386.rpm
+ - Linux arm64架构: arm64.deb/aarch64.rpm
+ - Linux armv7架构: armhf.deb/armhfp.rpm
- ### Windows (Win7 用户请查看下面FAQ手动替换内核使用)
+ ### Windows (Win7 用户请查看下面FAQ中的解决方案)
#### 正常版本(推荐)
- 64位: x64-setup.exe
- 32位: x86-setup.exe
diff --git a/clash-verge-rev/.github/workflows/release.yml b/clash-verge-rev/.github/workflows/release.yml
index 5159687e54..fcdfa46fa2 100644
--- a/clash-verge-rev/.github/workflows/release.yml
+++ b/clash-verge-rev/.github/workflows/release.yml
@@ -100,6 +100,12 @@ jobs:
NODE_OPTIONS: "--max_old_space_size=4096"
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+ APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+ APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+ APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+ APPLE_ID: ${{ secrets.APPLE_ID }}
+ APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+ APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
with:
target: ${{ matrix.target }}
@@ -126,7 +132,9 @@ jobs:
name: "Clash Verge Rev v${{env.VERSION}}"
body: "More new features are now supported."
token: ${{ secrets.GITHUB_TOKEN }}
- files: src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb
+ files: |
+ src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb
+ src-tauri/target/${{ matrix.target }}/release/bundle/rpm/*.rpm
release-for-fixed-webview2:
strategy:
diff --git a/clash-verge-rev/UPDATELOG.md b/clash-verge-rev/UPDATELOG.md
index 76b524e679..77bbcdff82 100644
--- a/clash-verge-rev/UPDATELOG.md
+++ b/clash-verge-rev/UPDATELOG.md
@@ -1,3 +1,17 @@
+## v1.6.5
+
+### Features
+
+- 添加 RPM 包支持
+- 优化细节
+
+### Bugs Fixes
+
+- MacOS 10.15 编辑器空白的问题
+- MacOS 低版本启动白屏的问题
+
+---
+
## v1.6.4
### Features
diff --git a/clash-verge-rev/package.json b/clash-verge-rev/package.json
index 2f4166e635..1c6a0e3aa4 100644
--- a/clash-verge-rev/package.json
+++ b/clash-verge-rev/package.json
@@ -1,6 +1,6 @@
{
"name": "clash-verge",
- "version": "1.6.4",
+ "version": "1.6.5",
"license": "GPL-3.0-only",
"scripts": {
"dev": "tauri dev",
@@ -24,30 +24,30 @@
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@juggle/resize-observer": "^3.4.0",
- "@mui/icons-material": "^5.15.16",
+ "@mui/icons-material": "^5.15.19",
"@mui/lab": "5.0.0-alpha.149",
- "@mui/material": "^5.15.16",
- "@mui/x-data-grid": "^6.19.11",
- "@tauri-apps/api": "^1.5.4",
+ "@mui/material": "^5.15.19",
+ "@mui/x-data-grid": "^6.20.0",
+ "@tauri-apps/api": "^1.5.6",
"@types/json-schema": "^7.0.15",
- "ahooks": "^3.7.11",
- "axios": "^1.6.8",
+ "ahooks": "^3.8.0",
+ "axios": "^1.7.2",
"dayjs": "1.11.5",
- "i18next": "^23.11.3",
+ "i18next": "^23.11.5",
"lodash-es": "^4.17.21",
- "meta-json-schema": "1.18.5-alpha",
+ "meta-json-schema": "1.18.5-alpha4",
"monaco-editor": "^0.49.0",
"monaco-yaml": "^5.1.1",
"nanoid": "^5.0.7",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-error-boundary": "^3.1.4",
- "react-hook-form": "^7.51.4",
+ "react-hook-form": "^7.51.5",
"react-i18next": "^13.5.0",
"react-markdown": "^9.0.1",
- "react-router-dom": "^6.23.0",
+ "react-router-dom": "^6.23.1",
"react-transition-group": "^4.4.5",
- "react-virtuoso": "^4.7.10",
+ "react-virtuoso": "^4.7.11",
"recoil": "^0.7.7",
"swr": "^1.3.0",
"tar": "^6.2.1",
@@ -55,16 +55,16 @@
},
"devDependencies": {
"@actions/github": "^5.1.1",
- "@tauri-apps/cli": "^1.5.13",
+ "@tauri-apps/cli": "^1.5.14",
"@types/fs-extra": "^9.0.13",
"@types/js-cookie": "^3.0.6",
"@types/lodash-es": "^4.17.12",
- "@types/react": "^18.3.1",
+ "@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react-transition-group": "^4.4.10",
- "@vitejs/plugin-legacy": "^5.4.0",
+ "@vitejs/plugin-legacy": "^5.4.1",
"@vitejs/plugin-react": "^4.3.0",
- "adm-zip": "^0.5.12",
+ "adm-zip": "^0.5.13",
"cross-env": "^7.0.3",
"fs-extra": "^11.2.0",
"https-proxy-agent": "^5.0.1",
@@ -72,10 +72,10 @@
"node-fetch": "^3.3.2",
"prettier": "^2.8.8",
"pretty-quick": "^3.3.1",
- "sass": "^1.77.0",
+ "sass": "^1.77.4",
"terser": "^5.31.0",
"typescript": "^5.4.5",
- "vite": "^5.2.11",
+ "vite": "^5.2.12",
"vite-plugin-monaco-editor": "^1.1.0",
"vite-plugin-svgr": "^4.2.0"
},
@@ -84,5 +84,6 @@
"semi": true,
"singleQuote": false,
"endOfLine": "lf"
- }
+ },
+ "packageManager": "pnpm@9.1.4"
}
diff --git a/clash-verge-rev/pnpm-lock.yaml b/clash-verge-rev/pnpm-lock.yaml
index db08d3497a..c66c97ef67 100644
--- a/clash-verge-rev/pnpm-lock.yaml
+++ b/clash-verge-rev/pnpm-lock.yaml
@@ -26,41 +26,41 @@ importers:
specifier: ^3.4.0
version: 3.4.0
"@mui/icons-material":
- specifier: ^5.15.16
- version: 5.15.18(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)
+ specifier: ^5.15.19
+ version: 5.15.19(@mui/material@5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)
"@mui/lab":
specifier: 5.0.0-alpha.149
- version: 5.0.0-alpha.149(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ version: 5.0.0-alpha.149(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
"@mui/material":
- specifier: ^5.15.16
- version: 5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ specifier: ^5.15.19
+ version: 5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
"@mui/x-data-grid":
- specifier: ^6.19.11
- version: 6.20.0(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ specifier: ^6.20.0
+ version: 6.20.0(@mui/material@5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
"@tauri-apps/api":
- specifier: ^1.5.4
+ specifier: ^1.5.6
version: 1.5.6
"@types/json-schema":
specifier: ^7.0.15
version: 7.0.15
ahooks:
- specifier: ^3.7.11
+ specifier: ^3.8.0
version: 3.8.0(react@18.3.1)
axios:
- specifier: ^1.6.8
+ specifier: ^1.7.2
version: 1.7.2
dayjs:
specifier: 1.11.5
version: 1.11.5
i18next:
- specifier: ^23.11.3
+ specifier: ^23.11.5
version: 23.11.5
lodash-es:
specifier: ^4.17.21
version: 4.17.21
meta-json-schema:
- specifier: 1.18.5-alpha
- version: 1.18.5-alpha
+ specifier: 1.18.5-alpha4
+ version: 1.18.5-alpha4
monaco-editor:
specifier: ^0.49.0
version: 0.49.0
@@ -80,7 +80,7 @@ importers:
specifier: ^3.1.4
version: 3.1.4(react@18.3.1)
react-hook-form:
- specifier: ^7.51.4
+ specifier: ^7.51.5
version: 7.51.5(react@18.3.1)
react-i18next:
specifier: ^13.5.0
@@ -89,13 +89,13 @@ importers:
specifier: ^9.0.1
version: 9.0.1(@types/react@18.3.3)(react@18.3.1)
react-router-dom:
- specifier: ^6.23.0
+ specifier: ^6.23.1
version: 6.23.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
react-transition-group:
specifier: ^4.4.5
version: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
react-virtuoso:
- specifier: ^4.7.10
+ specifier: ^4.7.11
version: 4.7.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
recoil:
specifier: ^0.7.7
@@ -114,7 +114,7 @@ importers:
specifier: ^5.1.1
version: 5.1.1
"@tauri-apps/cli":
- specifier: ^1.5.13
+ specifier: ^1.5.14
version: 1.5.14
"@types/fs-extra":
specifier: ^9.0.13
@@ -126,7 +126,7 @@ importers:
specifier: ^4.17.12
version: 4.17.12
"@types/react":
- specifier: ^18.3.1
+ specifier: ^18.3.3
version: 18.3.3
"@types/react-dom":
specifier: ^18.3.0
@@ -135,14 +135,14 @@ importers:
specifier: ^4.4.10
version: 4.4.10
"@vitejs/plugin-legacy":
- specifier: ^5.4.0
- version: 5.4.0(terser@5.31.0)(vite@5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0))
+ specifier: ^5.4.1
+ version: 5.4.1(terser@5.31.0)(vite@5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0))
"@vitejs/plugin-react":
specifier: ^4.3.0
- version: 4.3.0(vite@5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0))
+ version: 4.3.0(vite@5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0))
adm-zip:
- specifier: ^0.5.12
- version: 0.5.12
+ specifier: ^0.5.13
+ version: 0.5.13
cross-env:
specifier: ^7.0.3
version: 7.0.3
@@ -165,8 +165,8 @@ importers:
specifier: ^3.3.1
version: 3.3.1(prettier@2.8.8)
sass:
- specifier: ^1.77.0
- version: 1.77.2
+ specifier: ^1.77.4
+ version: 1.77.4
terser:
specifier: ^5.31.0
version: 5.31.0
@@ -174,14 +174,14 @@ importers:
specifier: ^5.4.5
version: 5.4.5
vite:
- specifier: ^5.2.11
- version: 5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0)
+ specifier: ^5.2.12
+ version: 5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0)
vite-plugin-monaco-editor:
specifier: ^1.1.0
version: 1.1.0(monaco-editor@0.49.0)
vite-plugin-svgr:
specifier: ^4.2.0
- version: 4.2.0(rollup@4.18.0)(typescript@5.4.5)(vite@5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0))
+ version: 4.2.0(rollup@4.18.0)(typescript@5.4.5)(vite@5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0))
packages:
"@actions/github@5.1.1":
@@ -1562,16 +1562,16 @@ packages:
"@types/react":
optional: true
- "@mui/core-downloads-tracker@5.15.18":
+ "@mui/core-downloads-tracker@5.15.19":
resolution:
{
- integrity: sha512-/9pVk+Al8qxAjwFUADv4BRZgMpZM4m5E+2Q/20qhVPuIJWqKp4Ie4tGExac6zu93rgPTYVQGgu+1vjiT0E+cEw==,
+ integrity: sha512-tCHSi/Tomez9ERynFhZRvFO6n9ATyrPs+2N80DMDzp6xDVirbBjEwhPcE+x7Lj+nwYw0SqFkOxyvMP0irnm55w==,
}
- "@mui/icons-material@5.15.18":
+ "@mui/icons-material@5.15.19":
resolution:
{
- integrity: sha512-jGhyw02TSLM0NgW+MDQRLLRUD/K4eN9rlK2pTBTL1OtzyZmQ8nB060zK1wA0b7cVrIiG+zyrRmNAvGWXwm2N9Q==,
+ integrity: sha512-RsEiRxA5azN9b8gI7JRqekkgvxQUlitoBOtZglflb8cUDyP12/cP4gRwhb44Ea1/zwwGGjAj66ZJpGHhKfibNA==,
}
engines: { node: ">=12.0.0" }
peerDependencies:
@@ -1603,10 +1603,10 @@ packages:
"@types/react":
optional: true
- "@mui/material@5.15.18":
+ "@mui/material@5.15.19":
resolution:
{
- integrity: sha512-n+/dsiqux74fFfcRUJjok+ieNQ7+BEk6/OwX9cLcLvriZrZb+/7Y8+Fd2HlUUbn5N0CDurgAHm0VH1DqyJ9HAw==,
+ integrity: sha512-lp5xQBbcRuxNtjpWU0BWZgIrv2XLUz4RJ0RqFXBdESIsKoGCQZ6P3wwU5ZPuj5TjssNiKv9AlM+vHopRxZhvVQ==,
}
engines: { node: ">=12.0.0" }
peerDependencies:
@@ -2238,10 +2238,10 @@ packages:
integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==,
}
- "@types/node@20.12.12":
+ "@types/node@20.14.1":
resolution:
{
- integrity: sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==,
+ integrity: sha512-T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA==,
}
"@types/parse-json@4.0.2":
@@ -2292,10 +2292,10 @@ packages:
integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==,
}
- "@vitejs/plugin-legacy@5.4.0":
+ "@vitejs/plugin-legacy@5.4.1":
resolution:
{
- integrity: sha512-Z7o44IbOIir/appjqtVzxnmLeGD8DjWGNm48lfPWZn4hxjzUjTkMX7BDwncpauWAQ/0VIz6uPeMHl3Za0Rw7wA==,
+ integrity: sha512-kee0l7dVevCNs1l3u2PnihVunvQ0WTJL2UJ/siQGD3Iht546mR9NO16tCv32uCP6lcGO1QDLqlPqInJtV1FE7A==,
}
engines: { node: ^18.0.0 || >=20.0.0 }
peerDependencies:
@@ -2319,12 +2319,12 @@ packages:
engines: { node: ">=0.4.0" }
hasBin: true
- adm-zip@0.5.12:
+ adm-zip@0.5.13:
resolution:
{
- integrity: sha512-6TVU49mK6KZb4qG6xWaaM4C7sA/sgUMLy/JYMOzkcp3BvVLpW0fXDFQiIzAuxFCt/2+xD7fNIiPFAoLZPhVNLQ==,
+ integrity: sha512-4U51tTl9J8UVEcuKGr6zRzY95tWoAa9l+ureGBNmsfleszjZblm5NyEEL/ZQxkhi86co5mZhSvL2T7gkZ6feYQ==,
}
- engines: { node: ">=6.0" }
+ engines: { node: ">=12.0" }
agent-base@6.0.2:
resolution:
@@ -2469,10 +2469,10 @@ packages:
}
engines: { node: ">=10" }
- caniuse-lite@1.0.30001623:
+ caniuse-lite@1.0.30001627:
resolution:
{
- integrity: sha512-X/XhAVKlpIxWPpgRTnlgZssJrF0m6YtRA0QDWgsBNT12uZM6LPRydR7ip405Y3t1LamD8cP2TZFEDZFBf5ApcA==,
+ integrity: sha512-4zgNiB8nTyV/tHhwZrFs88ryjls/lHiqFhrxCW4qSTeuRByBVnPYpDInchOIySWknznucaf31Z4KYqjfbrecVw==,
}
ccount@2.0.1:
@@ -2641,10 +2641,10 @@ packages:
integrity: sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==,
}
- debug@4.3.4:
+ debug@4.3.5:
resolution:
{
- integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==,
+ integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==,
}
engines: { node: ">=6.0" }
peerDependencies:
@@ -2697,10 +2697,10 @@ packages:
integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==,
}
- electron-to-chromium@1.4.783:
+ electron-to-chromium@1.4.788:
resolution:
{
- integrity: sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ==,
+ integrity: sha512-ubp5+Ev/VV8KuRoWnfP2QF2Bg+O2ZFdb49DiiNbz2VmgkIqrnyYaqIOqj8A6K/3p1xV0QcU5hBQ1+BmB6ot1OA==,
}
end-of-stream@1.4.4:
@@ -3282,10 +3282,10 @@ packages:
integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==,
}
- meta-json-schema@1.18.5-alpha:
+ meta-json-schema@1.18.5-alpha4:
resolution:
{
- integrity: sha512-ENjCoAdafLHz27AXzJCls7EnQ1X3JgzX3JPMzYXLzY1zofOxpEd6KeQh1JebAVYbGV9HM0wWSyIoKFRaWcKD5A==,
+ integrity: sha512-q+JzaM3tMssFPtfu7nxQmILKbJwq08c+0OfRnrdyYwiBaDd0Nim3LPIkiz9vJiuF4c3o5utLU39Q3z8VoUT0qQ==,
}
micromark-core-commonmark@2.0.1:
@@ -3976,10 +3976,10 @@ packages:
engines: { node: ">=18.0.0", npm: ">=8.0.0" }
hasBin: true
- sass@1.77.2:
+ sass@1.77.4:
resolution:
{
- integrity: sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==,
+ integrity: sha512-vcF3Ckow6g939GMA4PeU7b2K/9FALXk2KF9J87txdHzXbUF9XRQRwSxcAs/fGaTnJeBFd7UoV22j3lzMLdM0Pw==,
}
engines: { node: ">=14.0.0" }
hasBin: true
@@ -4329,10 +4329,10 @@ packages:
peerDependencies:
vite: ^2.6.0 || 3 || 4 || 5
- vite@5.2.11:
+ vite@5.2.12:
resolution:
{
- integrity: sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==,
+ integrity: sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==,
}
engines: { node: ^18.0.0 || >=20.0.0 }
hasBin: true
@@ -4450,10 +4450,10 @@ packages:
}
engines: { node: ">= 6" }
- yaml@2.4.2:
+ yaml@2.4.3:
resolution:
{
- integrity: sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==,
+ integrity: sha512-sntgmxj8o7DE7g/Qi60cqpLBA3HG3STcDA0kO+WfB05jEKhZMbY7umNm2rBpQvsmZ16/lPXCJGW2672dgOUkrg==,
}
engines: { node: ">= 14" }
hasBin: true
@@ -4504,7 +4504,7 @@ snapshots:
"@babel/traverse": 7.24.6
"@babel/types": 7.24.6
convert-source-map: 2.0.0
- debug: 4.3.4
+ debug: 4.3.5
gensync: 1.0.0-beta.2
json5: 2.2.3
semver: 6.3.1
@@ -4559,7 +4559,7 @@ snapshots:
"@babel/core": 7.24.6
"@babel/helper-compilation-targets": 7.24.6
"@babel/helper-plugin-utils": 7.24.6
- debug: 4.3.4
+ debug: 4.3.5
lodash.debounce: 4.0.8
resolve: 1.22.8
transitivePeerDependencies:
@@ -5189,7 +5189,7 @@ snapshots:
"@babel/helper-split-export-declaration": 7.24.6
"@babel/parser": 7.24.6
"@babel/types": 7.24.6
- debug: 4.3.4
+ debug: 4.3.5
globals: 11.12.0
transitivePeerDependencies:
- supports-color
@@ -5442,25 +5442,25 @@ snapshots:
optionalDependencies:
"@types/react": 18.3.3
- "@mui/core-downloads-tracker@5.15.18": {}
+ "@mui/core-downloads-tracker@5.15.19": {}
- "@mui/icons-material@5.15.18(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)":
+ "@mui/icons-material@5.15.19(@mui/material@5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)":
dependencies:
"@babel/runtime": 7.24.6
- "@mui/material": 5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ "@mui/material": 5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
react: 18.3.1
optionalDependencies:
"@types/react": 18.3.3
- "@mui/lab@5.0.0-alpha.149(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+ "@mui/lab@5.0.0-alpha.149(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
dependencies:
"@babel/runtime": 7.24.6
"@mui/base": 5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
- "@mui/material": 5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ "@mui/material": 5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
"@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)
"@mui/types": 7.2.14(@types/react@18.3.3)
"@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1)
- "@mui/x-tree-view": 6.0.0-alpha.1(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/base@5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ "@mui/x-tree-view": 6.0.0-alpha.1(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/base@5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/material@5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
clsx: 2.1.1
prop-types: 15.8.1
react: 18.3.1
@@ -5470,11 +5470,11 @@ snapshots:
"@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)
"@types/react": 18.3.3
- "@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+ "@mui/material@5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
dependencies:
"@babel/runtime": 7.24.6
"@mui/base": 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
- "@mui/core-downloads-tracker": 5.15.18
+ "@mui/core-downloads-tracker": 5.15.19
"@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)
"@mui/types": 7.2.14(@types/react@18.3.3)
"@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1)
@@ -5541,10 +5541,10 @@ snapshots:
optionalDependencies:
"@types/react": 18.3.3
- "@mui/x-data-grid@6.20.0(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+ "@mui/x-data-grid@6.20.0(@mui/material@5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
dependencies:
"@babel/runtime": 7.24.6
- "@mui/material": 5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ "@mui/material": 5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
"@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)
"@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1)
clsx: 2.1.1
@@ -5555,13 +5555,13 @@ snapshots:
transitivePeerDependencies:
- "@types/react"
- "@mui/x-tree-view@6.0.0-alpha.1(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/base@5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+ "@mui/x-tree-view@6.0.0-alpha.1(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/base@5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/material@5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
dependencies:
"@babel/runtime": 7.24.6
"@emotion/react": 11.11.4(@types/react@18.3.3)(react@18.3.1)
"@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)
"@mui/base": 5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
- "@mui/material": 5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+ "@mui/material": 5.15.19(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
"@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)
"@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1)
"@types/react-transition-group": 4.4.10
@@ -5845,7 +5845,7 @@ snapshots:
"@types/fs-extra@9.0.13":
dependencies:
- "@types/node": 20.12.12
+ "@types/node": 20.14.1
"@types/hast@3.0.4":
dependencies:
@@ -5867,7 +5867,7 @@ snapshots:
"@types/ms@0.7.34": {}
- "@types/node@20.12.12":
+ "@types/node@20.14.1":
dependencies:
undici-types: 5.26.5
@@ -5894,7 +5894,7 @@ snapshots:
"@ungap/structured-clone@1.2.0": {}
- "@vitejs/plugin-legacy@5.4.0(terser@5.31.0)(vite@5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0))":
+ "@vitejs/plugin-legacy@5.4.1(terser@5.31.0)(vite@5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0))":
dependencies:
"@babel/core": 7.24.6
"@babel/preset-env": 7.24.6(@babel/core@7.24.6)
@@ -5905,28 +5905,28 @@ snapshots:
regenerator-runtime: 0.14.1
systemjs: 6.15.1
terser: 5.31.0
- vite: 5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0)
+ vite: 5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0)
transitivePeerDependencies:
- supports-color
- "@vitejs/plugin-react@4.3.0(vite@5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0))":
+ "@vitejs/plugin-react@4.3.0(vite@5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0))":
dependencies:
"@babel/core": 7.24.6
"@babel/plugin-transform-react-jsx-self": 7.24.6(@babel/core@7.24.6)
"@babel/plugin-transform-react-jsx-source": 7.24.6(@babel/core@7.24.6)
"@types/babel__core": 7.20.5
react-refresh: 0.14.2
- vite: 5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0)
+ vite: 5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0)
transitivePeerDependencies:
- supports-color
acorn@8.11.3: {}
- adm-zip@0.5.12: {}
+ adm-zip@0.5.13: {}
agent-base@6.0.2:
dependencies:
- debug: 4.3.4
+ debug: 4.3.5
transitivePeerDependencies:
- supports-color
@@ -6011,8 +6011,8 @@ snapshots:
browserslist@4.23.0:
dependencies:
- caniuse-lite: 1.0.30001623
- electron-to-chromium: 1.4.783
+ caniuse-lite: 1.0.30001627
+ electron-to-chromium: 1.4.788
node-releases: 2.0.14
update-browserslist-db: 1.0.16(browserslist@4.23.0)
@@ -6022,7 +6022,7 @@ snapshots:
camelcase@6.3.0: {}
- caniuse-lite@1.0.30001623: {}
+ caniuse-lite@1.0.30001627: {}
ccount@2.0.1: {}
@@ -6113,7 +6113,7 @@ snapshots:
dayjs@1.11.5: {}
- debug@4.3.4:
+ debug@4.3.5:
dependencies:
ms: 2.1.2
@@ -6141,7 +6141,7 @@ snapshots:
no-case: 3.0.4
tslib: 2.6.2
- electron-to-chromium@1.4.783: {}
+ electron-to-chromium@1.4.788: {}
end-of-stream@1.4.4:
dependencies:
@@ -6307,7 +6307,7 @@ snapshots:
https-proxy-agent@5.0.1:
dependencies:
agent-base: 6.0.2
- debug: 4.3.4
+ debug: 4.3.5
transitivePeerDependencies:
- supports-color
@@ -6516,7 +6516,7 @@ snapshots:
merge-stream@2.0.0: {}
- meta-json-schema@1.18.5-alpha: {}
+ meta-json-schema@1.18.5-alpha4: {}
micromark-core-commonmark@2.0.1:
dependencies:
@@ -6632,7 +6632,7 @@ snapshots:
micromark@4.0.0:
dependencies:
"@types/debug": 4.1.12
- debug: 4.3.4
+ debug: 4.3.5
decode-named-character-reference: 1.0.2
devlop: 1.1.0
micromark-core-commonmark: 2.0.1
@@ -6704,7 +6704,7 @@ snapshots:
vscode-languageserver-textdocument: 1.0.11
vscode-languageserver-types: 3.17.5
vscode-uri: 3.0.8
- yaml: 2.4.2
+ yaml: 2.4.3
mri@1.2.0: {}
@@ -6997,7 +6997,7 @@ snapshots:
"@rollup/rollup-win32-x64-msvc": 4.18.0
fsevents: 2.3.3
- sass@1.77.2:
+ sass@1.77.4:
dependencies:
chokidar: 3.6.0
immutable: 4.3.6
@@ -7180,26 +7180,26 @@ snapshots:
dependencies:
monaco-editor: 0.49.0
- vite-plugin-svgr@4.2.0(rollup@4.18.0)(typescript@5.4.5)(vite@5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0)):
+ vite-plugin-svgr@4.2.0(rollup@4.18.0)(typescript@5.4.5)(vite@5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0)):
dependencies:
"@rollup/pluginutils": 5.1.0(rollup@4.18.0)
"@svgr/core": 8.1.0(typescript@5.4.5)
"@svgr/plugin-jsx": 8.1.0(@svgr/core@8.1.0(typescript@5.4.5))
- vite: 5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0)
+ vite: 5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0)
transitivePeerDependencies:
- rollup
- supports-color
- typescript
- vite@5.2.11(@types/node@20.12.12)(sass@1.77.2)(terser@5.31.0):
+ vite@5.2.12(@types/node@20.14.1)(sass@1.77.4)(terser@5.31.0):
dependencies:
esbuild: 0.20.2
postcss: 8.4.38
rollup: 4.18.0
optionalDependencies:
- "@types/node": 20.12.12
+ "@types/node": 20.14.1
fsevents: 2.3.3
- sass: 1.77.2
+ sass: 1.77.4
terser: 5.31.0
void-elements@3.1.0: {}
@@ -7238,6 +7238,6 @@ snapshots:
yaml@1.10.2: {}
- yaml@2.4.2: {}
+ yaml@2.4.3: {}
zwitch@2.0.4: {}
diff --git a/clash-verge-rev/src-tauri/Cargo.lock b/clash-verge-rev/src-tauri/Cargo.lock
index 50433c12ab..a078b5378d 100644
--- a/clash-verge-rev/src-tauri/Cargo.lock
+++ b/clash-verge-rev/src-tauri/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
dependencies = [
"gimli",
]
@@ -17,17 +17,6 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-[[package]]
-name = "ahash"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-dependencies = [
- "getrandom 0.2.14",
- "once_cell",
- "version_check",
-]
-
[[package]]
name = "ahash"
version = "0.8.11"
@@ -35,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
"once_cell",
"version_check",
"zerocopy",
@@ -97,25 +86,24 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.82"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
[[package]]
name = "arboard"
-version = "3.3.2"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58"
+checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89"
dependencies = [
"clipboard-win",
"core-graphics 0.23.2",
- "image",
+ "image 0.25.1",
"log 0.4.21",
- "objc",
- "objc-foundation",
- "objc_id",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
"parking_lot",
- "thiserror",
"windows-sys 0.48.0",
"wl-clipboard-rs",
"x11rb",
@@ -140,7 +128,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb"
dependencies = [
"event-listener 5.3.0",
- "event-listener-strategy 0.5.2",
+ "event-listener-strategy",
"futures-core",
"pin-project-lite",
]
@@ -158,22 +146,21 @@ dependencies = [
[[package]]
name = "async-channel"
-version = "2.2.1"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
dependencies = [
"concurrent-queue",
- "event-listener 5.3.0",
- "event-listener-strategy 0.5.2",
+ "event-listener-strategy",
"futures-core",
"pin-project-lite",
]
[[package]]
name = "async-executor"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a"
+checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
dependencies = [
"async-task",
"concurrent-queue",
@@ -200,7 +187,7 @@ version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
dependencies = [
- "async-lock 3.3.0",
+ "async-lock 3.4.0",
"blocking",
"futures-lite 2.3.0",
]
@@ -231,7 +218,7 @@ version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
dependencies = [
- "async-lock 3.3.0",
+ "async-lock 3.4.0",
"cfg-if",
"concurrent-queue",
"futures-io",
@@ -255,12 +242,12 @@ dependencies = [
[[package]]
name = "async-lock"
-version = "3.3.0"
+version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
dependencies = [
- "event-listener 4.0.3",
- "event-listener-strategy 0.4.0",
+ "event-listener 5.3.0",
+ "event-listener-strategy",
"pin-project-lite",
]
@@ -298,9 +285,9 @@ version = "2.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d"
dependencies = [
- "async-channel 2.2.1",
+ "async-channel 2.3.1",
"async-io 2.3.2",
- "async-lock 3.3.0",
+ "async-lock 3.4.0",
"async-signal",
"async-task",
"blocking",
@@ -320,17 +307,17 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
name = "async-signal"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda"
+checksum = "329972aa325176e89114919f2a80fdae4f4c040f66a370b1a1159c6c0f94e7aa"
dependencies = [
"async-io 2.3.2",
- "async-lock 3.3.0",
+ "async-lock 3.4.0",
"atomic-waker",
"cfg-if",
"futures-core",
@@ -355,7 +342,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -400,15 +387,15 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
[[package]]
name = "backtrace"
-version = "0.3.71"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
dependencies = [
"addr2line",
"cc",
@@ -433,9 +420,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
[[package]]
name = "base64"
-version = "0.22.0"
+version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
name = "bitflags"
@@ -474,13 +461,21 @@ dependencies = [
]
[[package]]
-name = "blocking"
-version = "1.6.0"
+name = "block2"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
dependencies = [
- "async-channel 2.2.1",
- "async-lock 3.3.0",
+ "objc2",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
+dependencies = [
+ "async-channel 2.3.1",
"async-task",
"futures-io",
"futures-lite 2.3.0",
@@ -517,9 +512,9 @@ dependencies = [
"boa_profiler",
"bytemuck",
"cfg-if",
- "dashmap 5.5.3",
+ "dashmap",
"fast-float",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
"icu_normalizer",
"indexmap 2.2.6",
"intrusive-collections",
@@ -554,7 +549,7 @@ checksum = "c055ef3cd87ea7db014779195bc90c6adfc35de4902e3b2fe587adecbd384578"
dependencies = [
"boa_macros",
"boa_profiler",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
"thin-vec",
]
@@ -566,7 +561,7 @@ checksum = "0cacc9caf022d92195c827a3e5bf83f96089d4bfaff834b359ac7b6be46e9187"
dependencies = [
"boa_gc",
"boa_macros",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
"indexmap 2.2.6",
"once_cell",
"phf 0.11.2",
@@ -582,7 +577,7 @@ checksum = "6be9c93793b60dac381af475b98634d4b451e28336e72218cad9a20176218dbc"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
"synstructure",
]
@@ -650,22 +645,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
[[package]]
name = "bytemuck"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60"
+checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -719,9 +714,9 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.95"
+version = "1.0.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b"
+checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
[[package]]
name = "cesu8"
@@ -788,7 +783,7 @@ dependencies = [
[[package]]
name = "clash-verge"
-version = "1.6.4"
+version = "1.6.5"
dependencies = [
"anyhow",
"auto-launch",
@@ -802,7 +797,7 @@ dependencies = [
"log4rs",
"nanoid",
"once_cell",
- "open 5.1.2",
+ "open 5.1.3",
"parking_lot",
"percent-encoding",
"port_scanner",
@@ -900,7 +895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d"
dependencies = [
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -982,9 +977,9 @@ dependencies = [
[[package]]
name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
dependencies = [
"cfg-if",
]
@@ -1002,9 +997,9 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
dependencies = [
"crossbeam-utils",
]
@@ -1030,9 +1025,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
[[package]]
name = "crypto-common"
@@ -1068,7 +1063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -1078,14 +1073,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
dependencies = [
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
name = "darling"
-version = "0.20.8"
+version = "0.20.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
+checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
dependencies = [
"darling_core",
"darling_macro",
@@ -1093,37 +1088,27 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.20.8"
+version = "0.20.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
+checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
name = "darling_macro"
-version = "0.20.8"
+version = "0.20.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
+checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.60",
-]
-
-[[package]]
-name = "dashmap"
-version = "4.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
-dependencies = [
- "cfg-if",
- "num_cpus",
+ "syn 2.0.66",
]
[[package]]
@@ -1133,7 +1118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
dependencies = [
"cfg-if",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
"lock_api",
"once_cell",
"parking_lot_core",
@@ -1161,17 +1146,17 @@ dependencies = [
[[package]]
name = "delay_timer"
-version = "0.11.5"
+version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d70c0d5d2addc05d1e0cf7e60b3a5bf08415f03136a773d7c66b4e4a3b892cef"
+checksum = "20eba879b7ee5f1d255d5666e16646fe384f899f71a4c0b4b0644e2e074964fe"
dependencies = [
"anyhow",
"async-trait",
"autocfg",
"concat-idents",
"cron_clock",
- "dashmap 4.0.2",
- "event-listener 2.5.3",
+ "dashmap",
+ "event-listener 5.3.0",
"futures",
"log 0.4.21",
"lru",
@@ -1213,7 +1198,7 @@ checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -1330,7 +1315,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -1371,9 +1356,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
[[package]]
name = "either"
-version = "1.11.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
[[package]]
name = "embed-resource"
@@ -1384,7 +1369,7 @@ dependencies = [
"cc",
"memchr",
"rustc_version 0.4.0",
- "toml 0.8.12",
+ "toml 0.8.13",
"vswhom",
"winreg 0.52.0",
]
@@ -1428,7 +1413,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -1439,9 +1424,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
dependencies = [
"libc",
"windows-sys 0.52.0",
@@ -1470,17 +1455,6 @@ dependencies = [
"pin-project-lite",
]
-[[package]]
-name = "event-listener"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
[[package]]
name = "event-listener"
version = "5.3.0"
@@ -1492,16 +1466,6 @@ dependencies = [
"pin-project-lite",
]
-[[package]]
-name = "event-listener-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
-dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite",
-]
-
[[package]]
name = "event-listener-strategy"
version = "0.5.2"
@@ -1583,9 +1547,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.29"
+version = "1.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4556222738635b7a3417ae6130d8f52201e45a0c4d1a907f0826383adb5f85e7"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -1624,7 +1588,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -1742,7 +1706,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -1916,9 +1880,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"libc",
@@ -1927,9 +1891,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
[[package]]
name = "gio"
@@ -2112,15 +2076,15 @@ dependencies = [
[[package]]
name = "h2"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
dependencies = [
+ "atomic-waker",
"bytes",
"fnv",
"futures-core",
"futures-sink",
- "futures-util",
"http 1.1.0",
"indexmap 2.2.6",
"slab",
@@ -2149,17 +2113,14 @@ name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.8",
-]
[[package]]
name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [
- "ahash 0.8.11",
+ "ahash",
"allocator-api2",
]
@@ -2340,7 +2301,7 @@ dependencies = [
"httpdate",
"itoa 1.0.11",
"pin-project-lite",
- "socket2 0.5.6",
+ "socket2 0.4.10",
"tokio",
"tower-service",
"tracing",
@@ -2356,7 +2317,7 @@ dependencies = [
"bytes",
"futures-channel",
"futures-util",
- "h2 0.4.4",
+ "h2 0.4.5",
"http 1.1.0",
"http-body 1.0.0",
"httparse",
@@ -2415,9 +2376,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.3"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
dependencies = [
"bytes",
"futures-channel",
@@ -2426,7 +2387,7 @@ dependencies = [
"http-body 1.0.0",
"hyper 1.3.1",
"pin-project-lite",
- "socket2 0.5.6",
+ "socket2 0.5.7",
"tokio",
"tower",
"tower-service",
@@ -2523,9 +2484,9 @@ checksum = "545c6c3e8bf9580e2dafee8de6f9ec14826aaf359787789c7724f1f85f47d3dc"
[[package]]
name = "icu_normalizer"
-version = "1.4.1"
+version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c183e31ed700f1ecd6b032d104c52fe8b15d028956b73727c97ec176b170e187"
+checksum = "accb85c5b2e76f8dade22978b3795ae1e550198c6cfc7e915144e17cd6e2ab56"
dependencies = [
"displaydoc",
"icu_collections",
@@ -2541,15 +2502,15 @@ dependencies = [
[[package]]
name = "icu_normalizer_data"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22026918a80e6a9a330cb01b60f950e2b4e5284c59528fd0c6150076ef4c8522"
+checksum = "e3744fecc0df9ce19999cdaf1f9f3a48c253431ce1d67ef499128fe9d0b607ab"
[[package]]
name = "icu_properties"
-version = "1.4.0"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976e296217453af983efa25f287a4c1da04b9a63bf1ed63719455068e4453eb5"
+checksum = "d8173ba888885d250016e957b8ebfd5a65cdb690123d8833a19f6833f9c2b579"
dependencies = [
"displaydoc",
"icu_collections",
@@ -2562,9 +2523,9 @@ dependencies = [
[[package]]
name = "icu_properties_data"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6a86c0e384532b06b6c104814f9c1b13bcd5b64409001c0d05713a1f3529d99"
+checksum = "e70a8b51ee5dd4ff8f20ee9b1dd1bc07afc110886a3747b1fec04cc6e5a15815"
[[package]]
name = "icu_provider"
@@ -2591,7 +2552,7 @@ checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -2636,6 +2597,17 @@ dependencies = [
"byteorder",
"color_quant",
"num-traits",
+]
+
+[[package]]
+name = "image"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "num-traits",
"png",
"tiff",
]
@@ -2658,7 +2630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
dependencies = [
"equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
"serde",
]
@@ -2682,9 +2654,9 @@ dependencies = [
[[package]]
name = "instant"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
dependencies = [
"cfg-if",
]
@@ -2737,7 +2709,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c416c05ba2a10240e022887617af3128fccdbf69713214da0fc81a5690d00df7"
dependencies = [
- "ahash 0.8.11",
+ "ahash",
"once_cell",
"regex 1.10.4",
]
@@ -2842,14 +2814,13 @@ dependencies = [
[[package]]
name = "json-patch"
-version = "1.2.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6"
+checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b"
dependencies = [
"serde",
"serde_json",
"thiserror",
- "treediff",
]
[[package]]
@@ -2903,9 +2874,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.153"
+version = "0.2.155"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
[[package]]
name = "libloading"
@@ -2951,15 +2922,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "litemap"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
[[package]]
name = "lock_api"
@@ -3040,11 +3011,11 @@ dependencies = [
[[package]]
name = "lru"
-version = "0.7.8"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
+checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown 0.14.5",
]
[[package]]
@@ -3173,9 +3144,9 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
[[package]]
name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
dependencies = [
"adler",
"simd-adler32",
@@ -3221,11 +3192,10 @@ dependencies = [
[[package]]
name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
dependencies = [
- "lazy_static 1.4.0",
"libc",
"log 0.4.21",
"openssl",
@@ -3369,11 +3339,10 @@ dependencies = [
[[package]]
name = "num-bigint"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
dependencies = [
- "autocfg",
"num-integer",
"num-traits",
"serde",
@@ -3407,9 +3376,9 @@ dependencies = [
[[package]]
name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
@@ -3463,7 +3432,7 @@ dependencies = [
"proc-macro-crate 3.1.0",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -3496,6 +3465,105 @@ dependencies = [
"objc_id",
]
+[[package]]
+name = "objc-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+dependencies = [
+ "bitflags 2.5.0",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-foundation",
+ "objc2-quartz-core",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.5.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
+
+[[package]]
+name = "objc2-foundation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+dependencies = [
+ "bitflags 2.5.0",
+ "block2",
+ "libc",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.5.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.5.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
[[package]]
name = "objc_exception"
version = "0.1.2"
@@ -3516,9 +3584,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.32.2"
+version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
dependencies = [
"memchr",
]
@@ -3547,9 +3615,9 @@ dependencies = [
[[package]]
name = "open"
-version = "5.1.2"
+version = "5.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32"
+checksum = "2eb49fbd5616580e9974662cb96a3463da4476e649a7e4b258df0de065db0657"
dependencies = [
"is-wsl",
"libc",
@@ -3579,7 +3647,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -3674,9 +3742,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
[[package]]
name = "parking_lot"
-version = "0.12.2"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
dependencies = [
"lock_api",
"parking_lot_core",
@@ -3697,9 +3765,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "1.0.14"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]]
name = "pathdiff"
@@ -3731,9 +3799,9 @@ checksum = "0a6dda33d67c26f0aac90d324ab2eb7239c819fc7b2552fe9faa4fe88441edc8"
[[package]]
name = "pest"
-version = "2.7.9"
+version = "2.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95"
+checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
dependencies = [
"memchr",
"thiserror",
@@ -3742,9 +3810,9 @@ dependencies = [
[[package]]
name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
dependencies = [
"fixedbitset",
"indexmap 2.2.6",
@@ -3864,7 +3932,7 @@ dependencies = [
"phf_shared 0.11.2",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -3911,7 +3979,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -3928,9 +3996,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "piper"
-version = "0.2.1"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
dependencies = [
"atomic-waker",
"fastrand 2.1.0",
@@ -4088,9 +4156,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]]
name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
dependencies = [
"unicode-ident",
]
@@ -4179,7 +4247,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
]
[[package]]
@@ -4250,7 +4318,7 @@ version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
"libredox",
"thiserror",
]
@@ -4327,7 +4395,7 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479"
dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
"memchr",
]
@@ -4379,12 +4447,12 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
"bytes",
"encoding_rs",
"futures-core",
"futures-util",
- "h2 0.4.4",
+ "h2 0.4.5",
"http 1.1.0",
"http-body 1.0.0",
"http-body-util",
@@ -4452,7 +4520,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
dependencies = [
"cc",
"cfg-if",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
"libc",
"spin",
"untrusted",
@@ -4479,9 +4547,9 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
[[package]]
name = "rustc-hash"
@@ -4504,7 +4572,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.22",
+ "semver 1.0.23",
]
[[package]]
@@ -4530,7 +4598,7 @@ dependencies = [
"bitflags 2.5.0",
"errno",
"libc",
- "linux-raw-sys 0.4.13",
+ "linux-raw-sys 0.4.14",
"windows-sys 0.52.0",
]
@@ -4563,21 +4631,21 @@ version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
"rustls-pki-types",
]
[[package]]
name = "rustls-pki-types"
-version = "1.5.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
[[package]]
name = "rustls-webpki"
-version = "0.102.3"
+version = "0.102.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
dependencies = [
"ring",
"rustls-pki-types",
@@ -4586,15 +4654,15 @@ dependencies = [
[[package]]
name = "rustversion"
-version = "1.0.15"
+version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
[[package]]
name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
[[package]]
name = "ryu-js"
@@ -4634,11 +4702,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "security-framework"
-version = "2.10.0"
+version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -4647,9 +4715,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.10.0"
+version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
dependencies = [
"core-foundation-sys",
"libc",
@@ -4695,9 +4763,9 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.22"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
dependencies = [
"serde",
]
@@ -4714,14 +4782,14 @@ version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
dependencies = [
- "pest 2.7.9",
+ "pest 2.7.10",
]
[[package]]
name = "serde"
-version = "1.0.199"
+version = "1.0.203"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
dependencies = [
"serde_derive",
]
@@ -4738,20 +4806,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.199"
+version = "1.0.203"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
name = "serde_json"
-version = "1.0.116"
+version = "1.0.117"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
dependencies = [
"indexmap 2.2.6",
"itoa 1.0.11",
@@ -4767,14 +4835,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
dependencies = [
"serde",
]
@@ -4793,11 +4861,11 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "3.8.0"
+version = "3.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c85f8e96d1d6857f13768fcbd895fcb06225510022a2774ed8b5150581847b0"
+checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
dependencies = [
- "base64 0.22.0",
+ "base64 0.22.1",
"chrono",
"hex",
"indexmap 1.9.3",
@@ -4811,14 +4879,14 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "3.8.0"
+version = "3.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8b3a576c4eb2924262d5951a3b737ccaf16c931e39a2810c36f9a7e25575557"
+checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -5005,9 +5073,9 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
dependencies = [
"libc",
"windows-sys 0.52.0",
@@ -5102,9 +5170,9 @@ dependencies = [
[[package]]
name = "strsim"
-version = "0.10.0"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "subtle"
@@ -5125,9 +5193,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.60"
+version = "2.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
dependencies = [
"proc-macro2",
"quote",
@@ -5148,14 +5216,14 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
name = "sysinfo"
-version = "0.30.11"
+version = "0.30.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87341a165d73787554941cd5ef55ad728011566fe714e987d1b976c15dbc3a83"
+checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
dependencies = [
"cfg-if",
"core-foundation-sys",
@@ -5169,7 +5237,7 @@ dependencies = [
[[package]]
name = "sysproxy"
version = "0.3.0"
-source = "git+https://github.com/zzzgydi/sysproxy-rs?branch=main#24e8d46cb338a6a8e28742dea6ed993cd6450780"
+source = "git+https://github.com/zzzgydi/sysproxy-rs?branch=main#bd912f90ae7f20b75c9278795551c13a7ea4c271"
dependencies = [
"interfaces",
"iptools",
@@ -5223,7 +5291,7 @@ dependencies = [
"cfg-expr 0.15.8",
"heck 0.5.0",
"pkg-config",
- "toml 0.8.12",
+ "toml 0.8.13",
"version-compare 0.2.0",
]
@@ -5251,7 +5319,7 @@ dependencies = [
"glib",
"glib-sys",
"gtk",
- "image",
+ "image 0.24.9",
"instant",
"jni",
"lazy_static 1.4.0",
@@ -5312,9 +5380,8 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
[[package]]
name = "tauri"
-version = "1.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "047aefcc7721bfb8024a9bc39d4719112262610502de7a224fa62c4570cd78d4"
+version = "1.6.7"
+source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4"
dependencies = [
"anyhow",
"base64 0.21.7",
@@ -5326,6 +5393,7 @@ dependencies = [
"encoding_rs",
"flate2",
"futures-util",
+ "getrandom 0.2.15",
"glib",
"glob",
"gtk",
@@ -5349,7 +5417,7 @@ dependencies = [
"regex 1.10.4",
"reqwest 0.11.27",
"rfd",
- "semver 1.0.22",
+ "semver 1.0.23",
"serde",
"serde_json",
"serde_repr",
@@ -5375,16 +5443,15 @@ dependencies = [
[[package]]
name = "tauri-build"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532"
+version = "1.5.2"
+source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4"
dependencies = [
"anyhow",
"cargo_toml",
"dirs-next",
- "heck 0.4.1",
+ "heck 0.5.0",
"json-patch",
- "semver 1.0.22",
+ "semver 1.0.23",
"serde",
"serde_json",
"tauri-utils",
@@ -5394,9 +5461,8 @@ dependencies = [
[[package]]
name = "tauri-codegen"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc"
+version = "1.4.3"
+source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4"
dependencies = [
"base64 0.21.7",
"brotli",
@@ -5407,7 +5473,7 @@ dependencies = [
"proc-macro2",
"quote",
"regex 1.10.4",
- "semver 1.0.22",
+ "semver 1.0.23",
"serde",
"serde_json",
"sha2 0.10.8",
@@ -5420,11 +5486,10 @@ dependencies = [
[[package]]
name = "tauri-macros"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875"
+version = "1.4.4"
+source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4"
dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -5434,9 +5499,8 @@ dependencies = [
[[package]]
name = "tauri-runtime"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76"
+version = "0.14.3"
+source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4"
dependencies = [
"gtk",
"http 0.2.12",
@@ -5455,9 +5519,8 @@ dependencies = [
[[package]]
name = "tauri-runtime-wry"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "067c56fc153b3caf406d7cd6de4486c80d1d66c0f414f39e94cb2f5543f6445f"
+version = "0.14.8"
+source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4"
dependencies = [
"arboard",
"cocoa 0.24.1",
@@ -5476,15 +5539,14 @@ dependencies = [
[[package]]
name = "tauri-utils"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ad0bbb31fccd1f4c56275d0a5c3abdf1f59999f72cb4ef8b79b4ed42082a21"
+version = "1.5.4"
+source = "git+https://github.com/Pylogmon/tauri?branch=1.x#9c0b64965560b28c3d06963494a3e0d2e1bae9f4"
dependencies = [
"brotli",
"ctor",
"dunce",
"glob",
- "heck 0.4.1",
+ "heck 0.5.0",
"html5ever",
"infer 0.13.0",
"json-patch",
@@ -5494,7 +5556,7 @@ dependencies = [
"phf 0.11.2",
"proc-macro2",
"quote",
- "semver 1.0.22",
+ "semver 1.0.23",
"serde",
"serde_json",
"serde_with",
@@ -5616,22 +5678,22 @@ checksum = "a38c90d48152c236a3ab59271da4f4ae63d678c5d7ad6b7714d7cb9760be5e4b"
[[package]]
name = "thiserror"
-version = "1.0.59"
+version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -5710,9 +5772,9 @@ dependencies = [
[[package]]
name = "tinystr"
-version = "0.7.5"
+version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
dependencies = [
"displaydoc",
"zerovec",
@@ -5735,9 +5797,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
dependencies = [
"backtrace",
"bytes",
@@ -5747,20 +5809,20 @@ dependencies = [
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.5.6",
+ "socket2 0.5.7",
"tokio-macros",
"windows-sys 0.48.0",
]
[[package]]
name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -5798,16 +5860,15 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
dependencies = [
"bytes",
"futures-core",
"futures-sink",
"pin-project-lite",
"tokio",
- "tracing",
]
[[package]]
@@ -5833,21 +5894,21 @@ dependencies = [
[[package]]
name = "toml"
-version = "0.8.12"
+version = "0.8.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
- "toml_edit 0.22.12",
+ "toml_edit 0.22.13",
]
[[package]]
name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
dependencies = [
"serde",
]
@@ -5878,15 +5939,15 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.22.12"
+version = "0.22.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
dependencies = [
"indexmap 2.2.6",
"serde",
"serde_spanned",
"toml_datetime",
- "winnow 0.6.7",
+ "winnow 0.6.9",
]
[[package]]
@@ -5902,7 +5963,6 @@ dependencies = [
"tokio",
"tower-layer",
"tower-service",
- "tracing",
]
[[package]]
@@ -5937,7 +5997,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -5981,9 +6041,9 @@ dependencies = [
[[package]]
name = "tree_magic_mini"
-version = "3.1.4"
+version = "3.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ee137597cdb361b55a4746983e4ac1b35ab6024396a419944ad473bb915265"
+checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2"
dependencies = [
"fnv",
"home",
@@ -5993,15 +6053,6 @@ dependencies = [
"petgraph",
]
-[[package]]
-name = "treediff"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d127780145176e2b5d16611cc25a900150e86e9fd79d3bde6ff3a37359c9cb5"
-dependencies = [
- "serde_json",
-]
-
[[package]]
name = "try-lock"
version = "0.2.5"
@@ -6180,7 +6231,7 @@ version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
]
[[package]]
@@ -6244,9 +6295,9 @@ dependencies = [
[[package]]
name = "waker-fn"
-version = "1.1.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
[[package]]
name = "walkdir"
@@ -6329,7 +6380,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
"wasm-bindgen-shared",
]
@@ -6363,7 +6414,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -6389,9 +6440,9 @@ dependencies = [
[[package]]
name = "wayland-backend"
-version = "0.3.3"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40"
+checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07"
dependencies = [
"cc",
"downcast-rs",
@@ -6403,9 +6454,9 @@ dependencies = [
[[package]]
name = "wayland-client"
-version = "0.31.2"
+version = "0.31.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f"
+checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133"
dependencies = [
"bitflags 2.5.0",
"rustix 0.38.34",
@@ -6440,9 +6491,9 @@ dependencies = [
[[package]]
name = "wayland-scanner"
-version = "0.31.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283"
+checksum = "67da50b9f80159dec0ea4c11c13e24ef9e7574bd6ce24b01860a175010cea565"
dependencies = [
"proc-macro2",
"quick-xml",
@@ -6451,9 +6502,9 @@ dependencies = [
[[package]]
name = "wayland-sys"
-version = "0.31.1"
+version = "0.31.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af"
+checksum = "105b1842da6554f91526c14a2a2172897b7f745a805d62af4ce698706be79c12"
dependencies = [
"dlib",
"log 0.4.21",
@@ -6730,7 +6781,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -6741,7 +6792,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -7041,9 +7092,9 @@ dependencies = [
[[package]]
name = "winnow"
-version = "0.6.7"
+version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578"
+checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6"
dependencies = [
"memchr",
]
@@ -7105,15 +7156,15 @@ checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
[[package]]
name = "writeable"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad7bb64b8ef9c0aa27b6da38b452b0ee9fd82beaf276a87dd796fb55cbae14e"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
[[package]]
name = "wry"
-version = "0.24.8"
+version = "0.24.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a04e72739ee84a218e3dbf8625888eadc874285637003ed21ab96a1bbbb538ec"
+checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45"
dependencies = [
"base64 0.13.1",
"block",
@@ -7170,9 +7221,9 @@ dependencies = [
[[package]]
name = "x11rb"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
+checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
dependencies = [
"gethostname",
"rustix 0.38.34",
@@ -7181,9 +7232,9 @@ dependencies = [
[[package]]
name = "x11rb-protocol"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
+checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
[[package]]
name = "xattr"
@@ -7192,7 +7243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
dependencies = [
"libc",
- "linux-raw-sys 0.4.13",
+ "linux-raw-sys 0.4.14",
"rustix 0.38.34",
]
@@ -7214,9 +7265,9 @@ dependencies = [
[[package]]
name = "yoke"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
dependencies = [
"serde",
"stable_deref_trait",
@@ -7226,33 +7277,32 @@ dependencies = [
[[package]]
name = "yoke-derive"
-version = "0.7.3"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
"synstructure",
]
[[package]]
name = "zbus"
-version = "4.1.2"
+version = "4.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9"
+checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f"
dependencies = [
"async-broadcast",
"async-executor",
"async-fs 2.1.2",
"async-io 2.3.2",
- "async-lock 3.3.0",
+ "async-lock 3.4.0",
"async-process 2.2.2",
"async-recursion",
"async-task",
"async-trait",
"blocking",
- "derivative",
"enumflags2",
"event-listener 5.3.0",
"futures-core",
@@ -7277,15 +7327,14 @@ dependencies = [
[[package]]
name = "zbus_macros"
-version = "4.1.2"
+version = "4.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0"
+checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1"
dependencies = [
"proc-macro-crate 3.1.0",
"proc-macro2",
"quote",
- "regex 1.10.4",
- "syn 1.0.109",
+ "syn 2.0.66",
"zvariant_utils",
]
@@ -7302,56 +7351,56 @@ dependencies = [
[[package]]
name = "zerocopy"
-version = "0.7.32"
+version = "0.7.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
name = "zerofrom"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
dependencies = [
"zerofrom-derive",
]
[[package]]
name = "zerofrom-derive"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
"synstructure",
]
[[package]]
name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
[[package]]
name = "zerovec"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea"
+checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
dependencies = [
"yoke",
"zerofrom",
@@ -7360,13 +7409,13 @@ dependencies = [
[[package]]
name = "zerovec-derive"
-version = "0.10.1"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20"
+checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.60",
+ "syn 2.0.66",
]
[[package]]
@@ -7382,9 +7431,9 @@ dependencies = [
[[package]]
name = "zvariant"
-version = "4.0.2"
+version = "4.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a"
+checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7"
dependencies = [
"endi",
"enumflags2",
@@ -7395,24 +7444,24 @@ dependencies = [
[[package]]
name = "zvariant_derive"
-version = "4.0.2"
+version = "4.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc"
+checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8"
dependencies = [
"proc-macro-crate 3.1.0",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.66",
"zvariant_utils",
]
[[package]]
name = "zvariant_utils"
-version = "1.1.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172"
+checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.66",
]
diff --git a/clash-verge-rev/src-tauri/Cargo.toml b/clash-verge-rev/src-tauri/Cargo.toml
index 7a9165026b..71d5dded7c 100644
--- a/clash-verge-rev/src-tauri/Cargo.toml
+++ b/clash-verge-rev/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "clash-verge"
-version = "1.6.4"
+version = "1.6.5"
description = "clash verge"
authors = ["zzzgydi", "wonfen", "MystiPanda"]
license = "GPL-3.0-only"
@@ -10,13 +10,13 @@ edition = "2021"
build = "build.rs"
[build-dependencies]
-tauri-build = { version = "1", features = [] }
+tauri-build = { git="https://github.com/Pylogmon/tauri",branch = "1.x", features = [] }
[dependencies]
warp = "0.3"
anyhow = "1.0"
dirs = "5.0"
-open = "5.0"
+open = "5.1"
log = "0.4"
dunce = "1.0"
log4rs = "1"
@@ -26,9 +26,9 @@ sysinfo = "0.30"
boa_engine = "0.18"
serde_json = "1.0"
serde_yaml = "0.9"
-once_cell = "1.18"
+once_cell = "1.19"
port_scanner = "0.1.5"
-delay_timer = "0.11.5"
+delay_timer = "0.11"
parking_lot = "0.12"
percent-encoding = "2.3.1"
window-shadows = { version = "0.2" }
@@ -37,8 +37,7 @@ serde = { version = "1.0", features = ["derive"] }
reqwest = { version = "0.12", features = ["json", "rustls-tls"] }
sysproxy = { git="https://github.com/zzzgydi/sysproxy-rs", branch = "main" }
auto-launch = { git="https://github.com/zzzgydi/auto-launch", branch = "main" }
-tauri = { version = "1.6", features = [ "fs-read-file", "fs-exists", "path-all", "protocol-asset", "dialog-open", "notification-all", "icon-png", "icon-ico", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all", "devtools"] }
-
+tauri = { git="https://github.com/Pylogmon/tauri",branch = "1.x", features = [ "fs-read-file", "fs-exists", "path-all", "protocol-asset", "dialog-open", "notification-all", "icon-png", "icon-ico", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all", "devtools"] }
[target.'cfg(windows)'.dependencies]
runas = "=1.2.0"
deelevate = "0.2.0"
diff --git a/clash-verge-rev/src-tauri/src/feat.rs b/clash-verge-rev/src-tauri/src/feat.rs
index f590351615..8f0f2efd81 100644
--- a/clash-verge-rev/src-tauri/src/feat.rs
+++ b/clash-verge-rev/src-tauri/src/feat.rs
@@ -385,11 +385,19 @@ pub async fn test_delay(url: String) -> Result {
.get(url).header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0");
let start = Instant::now();
- let response = request.send().await?;
- if response.status().is_success() {
- let delay = start.elapsed().as_millis() as u32;
- Ok(delay)
- } else {
- Ok(10000u32)
+ let response = request.send().await;
+ match response {
+ Ok(response) => {
+ log::trace!(target: "app", "test_delay response: {:#?}", response);
+ if response.status().is_success() {
+ Ok(start.elapsed().as_millis() as u32)
+ } else {
+ Ok(10000u32)
+ }
+ }
+ Err(err) => {
+ log::trace!(target: "app", "test_delay error: {:#?}", err);
+ Err(err.into())
+ }
}
}
diff --git a/clash-verge-rev/src-tauri/tauri.conf.json b/clash-verge-rev/src-tauri/tauri.conf.json
index 6ad011d4ae..84d7d9a944 100644
--- a/clash-verge-rev/src-tauri/tauri.conf.json
+++ b/clash-verge-rev/src-tauri/tauri.conf.json
@@ -2,7 +2,7 @@
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
"package": {
"productName": "Clash Verge",
- "version": "1.6.4"
+ "version": "1.6.5"
},
"build": {
"distDir": "../dist",
@@ -75,7 +75,7 @@
},
"windows": [],
"security": {
- "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: 'unsafe-eval' 'unsafe-inline' 'self';"
+ "csp": "default-src blob: data: filesystem: ws: wss: http: https: tauri: asset: 'unsafe-eval' 'unsafe-inline' 'self';"
}
}
}
diff --git a/clash-verge-rev/src-tauri/tauri.linux.conf.json b/clash-verge-rev/src-tauri/tauri.linux.conf.json
index ec1e7b5820..6300207260 100644
--- a/clash-verge-rev/src-tauri/tauri.linux.conf.json
+++ b/clash-verge-rev/src-tauri/tauri.linux.conf.json
@@ -6,10 +6,20 @@
},
"bundle": {
"identifier": "io.github.clash-verge-rev.clash-verge-rev",
- "targets": ["deb", "appimage", "updater"],
+ "targets": ["deb", "rpm", "appimage", "updater"],
"deb": {
"depends": ["openssl"],
- "desktopTemplate": "./template/clash-verge.desktop"
+ "desktopTemplate": "./template/clash-verge.desktop",
+ "provides": ["clash-verge", "clash-meta"],
+ "conflicts": ["clash-verge", "clash-meta"],
+ "replaces": ["clash-verge", "clash-meta"]
+ },
+ "rpm": {
+ "depends": ["openssl"],
+ "desktopTemplate": "./template/clash-verge.desktop",
+ "provides": ["clash-verge", "clash-meta"],
+ "conflicts": ["clash-verge", "clash-meta"],
+ "obsoletes": ["clash-verge", "clash-meta"]
}
}
}
diff --git a/clash-verge-rev/src/assets/image/test/apple.svg b/clash-verge-rev/src/assets/image/test/apple.svg
new file mode 100644
index 0000000000..70b04ed548
--- /dev/null
+++ b/clash-verge-rev/src/assets/image/test/apple.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/clash-verge-rev/src/assets/image/test/github.svg b/clash-verge-rev/src/assets/image/test/github.svg
new file mode 100644
index 0000000000..0baedc70fc
--- /dev/null
+++ b/clash-verge-rev/src/assets/image/test/github.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/clash-verge-rev/src/assets/image/test/google.svg b/clash-verge-rev/src/assets/image/test/google.svg
new file mode 100644
index 0000000000..b8bd3e9609
--- /dev/null
+++ b/clash-verge-rev/src/assets/image/test/google.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/clash-verge-rev/src/assets/image/test/youtube.svg b/clash-verge-rev/src/assets/image/test/youtube.svg
new file mode 100644
index 0000000000..1afee17835
--- /dev/null
+++ b/clash-verge-rev/src/assets/image/test/youtube.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/clash-verge-rev/src/components/connection/connection-item.tsx b/clash-verge-rev/src/components/connection/connection-item.tsx
index 5924800ae5..fa4a48a86b 100644
--- a/clash-verge-rev/src/components/connection/connection-item.tsx
+++ b/clash-verge-rev/src/components/connection/connection-item.tsx
@@ -19,6 +19,7 @@ const Tag = styled("span")(({ theme }) => ({
border: "1px solid",
borderRadius: 4,
borderColor: alpha(theme.palette.text.secondary, 0.35),
+ marginTop: "4px",
marginRight: "4px",
}));
diff --git a/clash-verge-rev/src/components/test/test-viewer.tsx b/clash-verge-rev/src/components/test/test-viewer.tsx
index 21918c4f7c..00d7f8d08b 100644
--- a/clash-verge-rev/src/components/test/test-viewer.tsx
+++ b/clash-verge-rev/src/components/test/test-viewer.tsx
@@ -39,7 +39,7 @@ export const TestViewer = forwardRef((props, ref) => {
}
return x;
});
- await patchVerge({ ...verge, test_list: newList });
+ await patchVerge({ test_list: newList });
};
useImperativeHandle(ref, () => ({
diff --git a/clash-verge-rev/src/pages/_theme.tsx b/clash-verge-rev/src/pages/_theme.tsx
index 68bddf244b..ec8a92cd91 100644
--- a/clash-verge-rev/src/pages/_theme.tsx
+++ b/clash-verge-rev/src/pages/_theme.tsx
@@ -4,14 +4,14 @@ const OS = getSystem();
// default theme setting
export const defaultTheme = {
primary_color: "#007AFF",
- secondary_color: "#fc9b76",
+ secondary_color: "#FC9B76",
primary_text: "#000000",
- secondary_text: "#3c3c4399",
+ secondary_text: "#3C3C4399",
info_color: "#007AFF",
error_color: "#FF3B30",
warning_color: "#FF9500",
success_color: "#06943D",
- background_color: "#f5f5f5",
+ background_color: "#F5F5F5",
font_family: `-apple-system, BlinkMacSystemFont,"Microsoft YaHei UI", "Microsoft YaHei", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji"${
OS === "windows" ? ", twemoji mozilla" : ""
}`,
@@ -22,9 +22,9 @@ export const defaultDarkTheme = {
...defaultTheme,
primary_color: "#0A84FF",
secondary_color: "#FF9F0A",
- primary_text: "#ffffff",
- background_color: "#2e303d",
- secondary_text: "#ebebf599",
+ primary_text: "#FFFFFF",
+ background_color: "#2E303D",
+ secondary_text: "#EBEBF599",
info_color: "#0A84FF",
error_color: "#FF453A",
warning_color: "#FF9F0A",
diff --git a/clash-verge-rev/src/pages/connections.tsx b/clash-verge-rev/src/pages/connections.tsx
index 96c9a03824..8494427cfd 100644
--- a/clash-verge-rev/src/pages/connections.tsx
+++ b/clash-verge-rev/src/pages/connections.tsx
@@ -1,14 +1,6 @@
import { useEffect, useMemo, useRef, useState } from "react";
import { useLockFn } from "ahooks";
-import {
- Box,
- Button,
- IconButton,
- MenuItem,
- Select,
- SelectProps,
- styled,
-} from "@mui/material";
+import { Box, Button, IconButton, MenuItem } from "@mui/material";
import { useRecoilState } from "recoil";
import { Virtuoso } from "react-virtuoso";
import { useTranslation } from "react-i18next";
@@ -34,7 +26,7 @@ const initConn = { uploadTotal: 0, downloadTotal: 0, connections: [] };
type OrderFunc = (list: IConnectionsItem[]) => IConnectionsItem[];
const ConnectionsPage = () => {
- const { t, i18n } = useTranslation();
+ const { t } = useTranslation();
const { clashInfo } = useClashInfo();
const { theme } = useCustomTheme();
const isDark = theme.palette.mode === "dark";
@@ -130,7 +122,7 @@ const ConnectionsPage = () => {
return (
{t("Connections")}}
contentStyle={{ height: "100%" }}
header={
@@ -159,7 +151,7 @@ const ConnectionsPage = () => {
}
@@ -209,7 +201,7 @@ const ConnectionsPage = () => {
) : (
(
+ itemContent={(_, item) => (
detailRef.current?.open(item)}
diff --git a/clash-verge-rev/src/pages/test.tsx b/clash-verge-rev/src/pages/test.tsx
index f3c73bb0fa..dc6fa6bfd3 100644
--- a/clash-verge-rev/src/pages/test.tsx
+++ b/clash-verge-rev/src/pages/test.tsx
@@ -22,6 +22,12 @@ import { TestItem } from "@/components/test/test-item";
import { emit } from "@tauri-apps/api/event";
import { nanoid } from "nanoid";
+// test icons
+import apple from "@/assets/image/test/apple.svg?raw";
+import github from "@/assets/image/test/github.svg?raw";
+import google from "@/assets/image/test/google.svg?raw";
+import youtube from "@/assets/image/test/youtube.svg?raw";
+
const TestPage = () => {
const { t } = useTranslation();
const sensors = useSensors(
@@ -38,19 +44,25 @@ const TestPage = () => {
uid: nanoid(),
name: "Apple",
url: "https://www.apple.com",
- icon: "https://www.apple.com/favicon.ico",
+ icon: apple,
},
{
uid: nanoid(),
name: "GitHub",
url: "https://www.github.com",
- icon: ``,
+ icon: github,
},
{
uid: nanoid(),
name: "Google",
url: "https://www.google.com",
- icon: ``,
+ icon: google,
+ },
+ {
+ uid: nanoid(),
+ name: "Youtube",
+ url: "https://www.youtube.com",
+ icon: youtube,
},
];
diff --git a/clash-verge-rev/vite.config.ts b/clash-verge-rev/vite.config.ts
index 4c47fa861c..9e4f714084 100644
--- a/clash-verge-rev/vite.config.ts
+++ b/clash-verge-rev/vite.config.ts
@@ -12,10 +12,12 @@ export default defineConfig({
svgr(),
react(),
legacy({
- targets: ["edge>=109", "safari>=13"],
+ renderLegacyChunks: false,
+ modernTargets: ["edge>=109", "safari>=13"],
modernPolyfills: true,
- polyfills: ["web.structured-clone"],
additionalModernPolyfills: [
+ "core-js/modules/es.object.has-own.js",
+ "core-js/modules/web.structured-clone.js",
path.resolve("./src/polyfills/matchMedia.js"),
path.resolve("./src/polyfills/WeakRef.js"),
path.resolve("./src/polyfills/RegExp.js"),
diff --git a/dns-over-https/doh-server/ietf.go b/dns-over-https/doh-server/ietf.go
index c3535b14b5..a4503a9d68 100644
--- a/dns-over-https/doh-server/ietf.go
+++ b/dns-over-https/doh-server/ietf.go
@@ -62,7 +62,7 @@ func (s *Server) parseRequestIETF(ctx context.Context, w http.ResponseWriter, r
if len(requestBinary) == 0 {
return &DNSRequest{
errcode: 400,
- errtext: fmt.Sprintf("Invalid argument value: \"dns\""),
+ errtext: "Invalid argument value: \"dns\"",
}
}
diff --git a/echo/cf-workers/ws/.editorconfig b/echo/cf-workers/ws/.editorconfig
new file mode 100644
index 0000000000..a727df347a
--- /dev/null
+++ b/echo/cf-workers/ws/.editorconfig
@@ -0,0 +1,12 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.yml]
+indent_style = space
diff --git a/echo/cf-workers/ws/.gitignore b/echo/cf-workers/ws/.gitignore
new file mode 100644
index 0000000000..3b0fe33c47
--- /dev/null
+++ b/echo/cf-workers/ws/.gitignore
@@ -0,0 +1,172 @@
+# Logs
+
+logs
+_.log
+npm-debug.log_
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+
+report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
+
+# Runtime data
+
+pids
+_.pid
+_.seed
+\*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+
+lib-cov
+
+# Coverage directory used by tools like istanbul
+
+coverage
+\*.lcov
+
+# nyc test coverage
+
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+
+bower_components
+
+# node-waf configuration
+
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+
+build/Release
+
+# Dependency directories
+
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+
+web_modules/
+
+# TypeScript cache
+
+\*.tsbuildinfo
+
+# Optional npm cache directory
+
+.npm
+
+# Optional eslint cache
+
+.eslintcache
+
+# Optional stylelint cache
+
+.stylelintcache
+
+# Microbundle cache
+
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+
+.node_repl_history
+
+# Output of 'npm pack'
+
+\*.tgz
+
+# Yarn Integrity file
+
+.yarn-integrity
+
+# dotenv environment variable files
+
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+
+.cache
+.parcel-cache
+
+# Next.js build output
+
+.next
+out
+
+# Nuxt.js build / generate output
+
+.nuxt
+dist
+
+# Gatsby files
+
+.cache/
+
+# Comment in the public line in if your project uses Gatsby and not Next.js
+
+# https://nextjs.org/blog/next-9-1#public-directory-support
+
+# public
+
+# vuepress build output
+
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+
+.temp
+.cache
+
+# Docusaurus cache and generated files
+
+.docusaurus
+
+# Serverless directories
+
+.serverless/
+
+# FuseBox cache
+
+.fusebox/
+
+# DynamoDB Local files
+
+.dynamodb/
+
+# TernJS port file
+
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+
+.vscode-test
+
+# yarn v2
+
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.\*
+
+# wrangler project
+
+.dev.vars
+.wrangler/
diff --git a/echo/cf-workers/ws/.prettierrc b/echo/cf-workers/ws/.prettierrc
new file mode 100644
index 0000000000..5c7b5d3c7a
--- /dev/null
+++ b/echo/cf-workers/ws/.prettierrc
@@ -0,0 +1,6 @@
+{
+ "printWidth": 140,
+ "singleQuote": true,
+ "semi": true,
+ "useTabs": true
+}
diff --git a/echo/cf-workers/ws/package-lock.json b/echo/cf-workers/ws/package-lock.json
new file mode 100644
index 0000000000..b4414da761
--- /dev/null
+++ b/echo/cf-workers/ws/package-lock.json
@@ -0,0 +1,5047 @@
+{
+ "name": "ws",
+ "version": "0.0.0",
+ "lockfileVersion": 2,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "ws",
+ "version": "0.0.0",
+ "devDependencies": {
+ "@cloudflare/vitest-pool-workers": "^0.1.0",
+ "@cloudflare/workers-types": "^4.20240603.0",
+ "typescript": "^5.0.4",
+ "vitest": "1.3.0",
+ "wrangler": "^3.0.0"
+ }
+ },
+ "node_modules/@cloudflare/kv-asset-handler": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.3.2.tgz",
+ "integrity": "sha512-EeEjMobfuJrwoctj7FA1y1KEbM0+Q1xSjobIEyie9k4haVEBB7vkDvsasw1pM3rO39mL2akxIAzLMUAtrMHZhA==",
+ "dev": true,
+ "dependencies": {
+ "mime": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=16.13"
+ }
+ },
+ "node_modules/@cloudflare/vitest-pool-workers": {
+ "version": "0.1.19",
+ "resolved": "https://registry.npmjs.org/@cloudflare/vitest-pool-workers/-/vitest-pool-workers-0.1.19.tgz",
+ "integrity": "sha512-fb3rxrihwd4OsBf4mALlezo6nnuL5p/BopGu47MeV5LlTjP3sGFT1QYbXsdv6rfNsxBGSP7uAahCWBhTsNFy0w==",
+ "dev": true,
+ "dependencies": {
+ "birpc": "0.2.14",
+ "cjs-module-lexer": "^1.2.3",
+ "devalue": "^4.3.0",
+ "esbuild": "0.17.19",
+ "miniflare": "3.20240405.1",
+ "wrangler": "3.50.0",
+ "zod": "^3.20.6"
+ },
+ "peerDependencies": {
+ "@vitest/runner": "1.3.0",
+ "@vitest/snapshot": "1.3.0",
+ "vitest": "1.3.0"
+ }
+ },
+ "node_modules/@cloudflare/vitest-pool-workers/node_modules/@cloudflare/kv-asset-handler": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.3.1.tgz",
+ "integrity": "sha512-lKN2XCfKCmpKb86a1tl4GIwsJYDy9TGuwjhDELLmpKygQhw8X2xR4dusgpC5Tg7q1pB96Eb0rBo81kxSILQMwA==",
+ "dev": true,
+ "dependencies": {
+ "mime": "^3.0.0"
+ }
+ },
+ "node_modules/@cloudflare/vitest-pool-workers/node_modules/wrangler": {
+ "version": "3.50.0",
+ "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-3.50.0.tgz",
+ "integrity": "sha512-JlLuch+6DtaC5HGp8YD9Au++XvMv34g3ySdlB5SyPbaObELi8P9ZID5vgyf9AA75djzxL7cuNOk1YdKCJEuq0w==",
+ "dev": true,
+ "dependencies": {
+ "@cloudflare/kv-asset-handler": "0.3.1",
+ "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
+ "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
+ "blake3-wasm": "^2.1.5",
+ "chokidar": "^3.5.3",
+ "esbuild": "0.17.19",
+ "miniflare": "3.20240405.1",
+ "nanoid": "^3.3.3",
+ "path-to-regexp": "^6.2.0",
+ "resolve": "^1.22.8",
+ "resolve.exports": "^2.0.2",
+ "selfsigned": "^2.0.1",
+ "source-map": "0.6.1",
+ "ts-json-schema-generator": "^1.5.0",
+ "xxhash-wasm": "^1.0.1"
+ },
+ "bin": {
+ "wrangler": "bin/wrangler.js",
+ "wrangler2": "bin/wrangler.js"
+ },
+ "engines": {
+ "node": ">=16.17.0"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.2"
+ },
+ "peerDependencies": {
+ "@cloudflare/workers-types": "^4.20240405.0"
+ },
+ "peerDependenciesMeta": {
+ "@cloudflare/workers-types": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@cloudflare/workerd-darwin-64": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20240405.0.tgz",
+ "integrity": "sha512-ut8kwpHmlz9dNSjoov6v1b6jS50J46Mj9QcMA0t1Hne36InaQk/qqPSd12fN5p2GesZ9OOBJvBdDsTblVdyJ1w==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/@cloudflare/workerd-darwin-arm64": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20240405.0.tgz",
+ "integrity": "sha512-x3A3Ym+J2DH1uYnw0aedeKOTnUebEo312+Aladv7bFri97pjRJcqVbYhMtOHLkHjwYn7bpKSY2eL5iM+0XT29A==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/@cloudflare/workerd-linux-64": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20240405.0.tgz",
+ "integrity": "sha512-3tYpfjtxEQ0R30Pna7OF3Bz0CTx30hc0QNtH61KnkvXtaeYMkWutSKQKXIuVlPa/7v1MHp+8ViBXMflmS7HquA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/@cloudflare/workerd-linux-arm64": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20240405.0.tgz",
+ "integrity": "sha512-NpKZlvmdgcX/m4tP5zM91AfJpZrue2/GRA+Sl3szxAivu2uE5jDVf5SS9dzqzCVfPrdhylqH7yeL4U/cafFNOg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/@cloudflare/workerd-windows-64": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20240405.0.tgz",
+ "integrity": "sha512-REBeJMxvUCjwuEVzSSIBtzAyM69QjToab8qBst0S9vdih+9DObym4dw8CevdBQhDbFrHiyL9E6pAZpLPNHVgCw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/@cloudflare/workers-types": {
+ "version": "4.20240603.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20240603.0.tgz",
+ "integrity": "sha512-KmsjZcd/dPWM51FoT08cvUGCq9l3nFEriloQ12mcdJPoW911Gi5S/9Cq4xeFvTrtk9TJ2krvxP23IeobecRmOQ==",
+ "dev": true
+ },
+ "node_modules/@cspotcode/source-map-support": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+ "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/trace-mapping": "0.3.9"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild-plugins/node-globals-polyfill": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@esbuild-plugins/node-globals-polyfill/-/node-globals-polyfill-0.2.3.tgz",
+ "integrity": "sha512-r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw==",
+ "dev": true,
+ "peerDependencies": {
+ "esbuild": "*"
+ }
+ },
+ "node_modules/@esbuild-plugins/node-modules-polyfill": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/@esbuild-plugins/node-modules-polyfill/-/node-modules-polyfill-0.2.2.tgz",
+ "integrity": "sha512-LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA==",
+ "dev": true,
+ "dependencies": {
+ "escape-string-regexp": "^4.0.0",
+ "rollup-plugin-node-polyfills": "^0.2.1"
+ },
+ "peerDependencies": {
+ "esbuild": "*"
+ }
+ },
+ "node_modules/@esbuild/aix-ppc64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+ "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "aix"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/android-arm": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz",
+ "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/android-arm64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz",
+ "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/android-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz",
+ "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/darwin-arm64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz",
+ "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/darwin-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz",
+ "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/freebsd-arm64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz",
+ "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/freebsd-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz",
+ "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/linux-arm": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz",
+ "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/linux-arm64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz",
+ "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/linux-ia32": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz",
+ "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/linux-loong64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz",
+ "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==",
+ "cpu": [
+ "loong64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/linux-mips64el": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz",
+ "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==",
+ "cpu": [
+ "mips64el"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/linux-ppc64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz",
+ "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/linux-riscv64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz",
+ "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/linux-s390x": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz",
+ "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/linux-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz",
+ "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/netbsd-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz",
+ "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/openbsd-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz",
+ "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/sunos-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz",
+ "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "sunos"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/win32-arm64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz",
+ "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/win32-ia32": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz",
+ "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@esbuild/win32-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz",
+ "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@fastify/busboy": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
+ "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
+ "dev": true,
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@jest/schemas": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+ "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+ "dev": true,
+ "dependencies": {
+ "@sinclair/typebox": "^0.27.8"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/@jridgewell/resolve-uri": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/sourcemap-codec": {
+ "version": "1.4.15",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+ "dev": true
+ },
+ "node_modules/@jridgewell/trace-mapping": {
+ "version": "0.3.9",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+ "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/resolve-uri": "^3.0.3",
+ "@jridgewell/sourcemap-codec": "^1.4.10"
+ }
+ },
+ "node_modules/@rollup/rollup-android-arm-eabi": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
+ "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@rollup/rollup-android-arm64": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
+ "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@rollup/rollup-darwin-arm64": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
+ "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@rollup/rollup-darwin-x64": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
+ "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
+ "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
+ "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-arm64-gnu": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
+ "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-arm64-musl": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
+ "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
+ "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
+ "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-s390x-gnu": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
+ "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-x64-gnu": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
+ "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-x64-musl": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
+ "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-win32-arm64-msvc": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
+ "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@rollup/rollup-win32-ia32-msvc": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
+ "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@rollup/rollup-win32-x64-msvc": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
+ "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@sinclair/typebox": {
+ "version": "0.27.8",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+ "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+ "dev": true
+ },
+ "node_modules/@types/estree": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+ "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+ "dev": true
+ },
+ "node_modules/@types/json-schema": {
+ "version": "7.0.15",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+ "dev": true
+ },
+ "node_modules/@types/node": {
+ "version": "20.14.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz",
+ "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
+ "dev": true,
+ "dependencies": {
+ "undici-types": "~5.26.4"
+ }
+ },
+ "node_modules/@types/node-forge": {
+ "version": "1.3.11",
+ "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+ "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+ "dev": true,
+ "dependencies": {
+ "@types/node": "*"
+ }
+ },
+ "node_modules/@vitest/expect": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.3.0.tgz",
+ "integrity": "sha512-7bWt0vBTZj08B+Ikv70AnLRicohYwFgzNjFqo9SxxqHHxSlUJGSXmCRORhOnRMisiUryKMdvsi1n27Bc6jL9DQ==",
+ "dev": true,
+ "dependencies": {
+ "@vitest/spy": "1.3.0",
+ "@vitest/utils": "1.3.0",
+ "chai": "^4.3.10"
+ },
+ "funding": {
+ "url": "https://opencollective.com/vitest"
+ }
+ },
+ "node_modules/@vitest/runner": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.3.0.tgz",
+ "integrity": "sha512-1Jb15Vo/Oy7mwZ5bXi7zbgszsdIBNjc4IqP8Jpr/8RdBC4nF1CTzIAn2dxYvpF1nGSseeL39lfLQ2uvs5u1Y9A==",
+ "dev": true,
+ "dependencies": {
+ "@vitest/utils": "1.3.0",
+ "p-limit": "^5.0.0",
+ "pathe": "^1.1.1"
+ },
+ "funding": {
+ "url": "https://opencollective.com/vitest"
+ }
+ },
+ "node_modules/@vitest/snapshot": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.3.0.tgz",
+ "integrity": "sha512-swmktcviVVPYx9U4SEQXLV6AEY51Y6bZ14jA2yo6TgMxQ3h+ZYiO0YhAHGJNp0ohCFbPAis1R9kK0cvN6lDPQA==",
+ "dev": true,
+ "dependencies": {
+ "magic-string": "^0.30.5",
+ "pathe": "^1.1.1",
+ "pretty-format": "^29.7.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/vitest"
+ }
+ },
+ "node_modules/@vitest/spy": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.3.0.tgz",
+ "integrity": "sha512-AkCU0ThZunMvblDpPKgjIi025UxR8V7MZ/g/EwmAGpjIujLVV2X6rGYGmxE2D4FJbAy0/ijdROHMWa2M/6JVMw==",
+ "dev": true,
+ "dependencies": {
+ "tinyspy": "^2.2.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/vitest"
+ }
+ },
+ "node_modules/@vitest/utils": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.3.0.tgz",
+ "integrity": "sha512-/LibEY/fkaXQufi4GDlQZhikQsPO2entBKtfuyIpr1jV4DpaeasqkeHjhdOhU24vSHshcSuEyVlWdzvv2XmYCw==",
+ "dev": true,
+ "dependencies": {
+ "diff-sequences": "^29.6.3",
+ "estree-walker": "^3.0.3",
+ "loupe": "^2.3.7",
+ "pretty-format": "^29.7.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/vitest"
+ }
+ },
+ "node_modules/acorn": {
+ "version": "8.11.3",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+ "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+ "dev": true,
+ "bin": {
+ "acorn": "bin/acorn"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/acorn-walk": {
+ "version": "8.3.2",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+ "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/ansi-styles": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/anymatch": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+ "dev": true,
+ "dependencies": {
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/as-table": {
+ "version": "1.0.55",
+ "resolved": "https://registry.npmjs.org/as-table/-/as-table-1.0.55.tgz",
+ "integrity": "sha512-xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ==",
+ "dev": true,
+ "dependencies": {
+ "printable-characters": "^1.0.42"
+ }
+ },
+ "node_modules/assertion-error": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+ "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+ "dev": true
+ },
+ "node_modules/binary-extensions": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/birpc": {
+ "version": "0.2.14",
+ "resolved": "https://registry.npmjs.org/birpc/-/birpc-0.2.14.tgz",
+ "integrity": "sha512-37FHE8rqsYM5JEKCnXFyHpBCzvgHEExwVVTq+nUmloInU7l8ezD1TpOhKpS8oe1DTYFqEK27rFZVKG43oTqXRA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ }
+ },
+ "node_modules/blake3-wasm": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/blake3-wasm/-/blake3-wasm-2.1.5.tgz",
+ "integrity": "sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==",
+ "dev": true
+ },
+ "node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/braces": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+ "dev": true,
+ "dependencies": {
+ "fill-range": "^7.1.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/cac": {
+ "version": "6.7.14",
+ "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+ "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/capnp-ts": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/capnp-ts/-/capnp-ts-0.7.0.tgz",
+ "integrity": "sha512-XKxXAC3HVPv7r674zP0VC3RTXz+/JKhfyw94ljvF80yynK6VkTnqE3jMuN8b3dUVmmc43TjyxjW4KTsmB3c86g==",
+ "dev": true,
+ "dependencies": {
+ "debug": "^4.3.1",
+ "tslib": "^2.2.0"
+ }
+ },
+ "node_modules/chai": {
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
+ "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
+ "dev": true,
+ "dependencies": {
+ "assertion-error": "^1.1.0",
+ "check-error": "^1.0.3",
+ "deep-eql": "^4.1.3",
+ "get-func-name": "^2.0.2",
+ "loupe": "^2.3.6",
+ "pathval": "^1.1.1",
+ "type-detect": "^4.0.8"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/check-error": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+ "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+ "dev": true,
+ "dependencies": {
+ "get-func-name": "^2.0.2"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/chokidar": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+ "dev": true,
+ "dependencies": {
+ "anymatch": "~3.1.2",
+ "braces": "~3.0.2",
+ "glob-parent": "~5.1.2",
+ "is-binary-path": "~2.1.0",
+ "is-glob": "~4.0.1",
+ "normalize-path": "~3.0.0",
+ "readdirp": "~3.6.0"
+ },
+ "engines": {
+ "node": ">= 8.10.0"
+ },
+ "funding": {
+ "url": "https://paulmillr.com/funding/"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.2"
+ }
+ },
+ "node_modules/cjs-module-lexer": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
+ "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==",
+ "dev": true
+ },
+ "node_modules/commander": {
+ "version": "12.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+ "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+ "dev": true,
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/confbox": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
+ "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==",
+ "dev": true
+ },
+ "node_modules/cookie": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+ "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/cross-spawn": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "dev": true,
+ "dependencies": {
+ "path-key": "^3.1.0",
+ "shebang-command": "^2.0.0",
+ "which": "^2.0.1"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/data-uri-to-buffer": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.2.tgz",
+ "integrity": "sha512-ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA==",
+ "dev": true
+ },
+ "node_modules/debug": {
+ "version": "4.3.5",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+ "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+ "dev": true,
+ "dependencies": {
+ "ms": "2.1.2"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/deep-eql": {
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
+ "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
+ "dev": true,
+ "dependencies": {
+ "type-detect": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/devalue": {
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/devalue/-/devalue-4.3.3.tgz",
+ "integrity": "sha512-UH8EL6H2ifcY8TbD2QsxwCC/pr5xSwPvv85LrLXVihmHVC3T3YqTCIwnR5ak0yO1KYqlxrPVOA/JVZJYPy2ATg==",
+ "dev": true
+ },
+ "node_modules/diff-sequences": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+ "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+ "dev": true,
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/esbuild": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz",
+ "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==",
+ "dev": true,
+ "hasInstallScript": true,
+ "bin": {
+ "esbuild": "bin/esbuild"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "optionalDependencies": {
+ "@esbuild/android-arm": "0.17.19",
+ "@esbuild/android-arm64": "0.17.19",
+ "@esbuild/android-x64": "0.17.19",
+ "@esbuild/darwin-arm64": "0.17.19",
+ "@esbuild/darwin-x64": "0.17.19",
+ "@esbuild/freebsd-arm64": "0.17.19",
+ "@esbuild/freebsd-x64": "0.17.19",
+ "@esbuild/linux-arm": "0.17.19",
+ "@esbuild/linux-arm64": "0.17.19",
+ "@esbuild/linux-ia32": "0.17.19",
+ "@esbuild/linux-loong64": "0.17.19",
+ "@esbuild/linux-mips64el": "0.17.19",
+ "@esbuild/linux-ppc64": "0.17.19",
+ "@esbuild/linux-riscv64": "0.17.19",
+ "@esbuild/linux-s390x": "0.17.19",
+ "@esbuild/linux-x64": "0.17.19",
+ "@esbuild/netbsd-x64": "0.17.19",
+ "@esbuild/openbsd-x64": "0.17.19",
+ "@esbuild/sunos-x64": "0.17.19",
+ "@esbuild/win32-arm64": "0.17.19",
+ "@esbuild/win32-ia32": "0.17.19",
+ "@esbuild/win32-x64": "0.17.19"
+ }
+ },
+ "node_modules/escape-string-regexp": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/estree-walker": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+ "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+ "dev": true,
+ "dependencies": {
+ "@types/estree": "^1.0.0"
+ }
+ },
+ "node_modules/execa": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
+ "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
+ "dev": true,
+ "dependencies": {
+ "cross-spawn": "^7.0.3",
+ "get-stream": "^8.0.1",
+ "human-signals": "^5.0.0",
+ "is-stream": "^3.0.0",
+ "merge-stream": "^2.0.0",
+ "npm-run-path": "^5.1.0",
+ "onetime": "^6.0.0",
+ "signal-exit": "^4.1.0",
+ "strip-final-newline": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=16.17"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/execa?sponsor=1"
+ }
+ },
+ "node_modules/exit-hook": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-2.2.1.tgz",
+ "integrity": "sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==",
+ "dev": true,
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/fill-range": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+ "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+ "dev": true,
+ "dependencies": {
+ "to-regex-range": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+ "dev": true
+ },
+ "node_modules/fsevents": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+ "dev": true,
+ "hasInstallScript": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+ }
+ },
+ "node_modules/function-bind": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/get-func-name": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+ "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/get-source": {
+ "version": "2.0.12",
+ "resolved": "https://registry.npmjs.org/get-source/-/get-source-2.0.12.tgz",
+ "integrity": "sha512-X5+4+iD+HoSeEED+uwrQ07BOQr0kEDFMVqqpBuI+RaZBpBpHCuXxo70bjar6f0b0u/DQJsJ7ssurpP0V60Az+w==",
+ "dev": true,
+ "dependencies": {
+ "data-uri-to-buffer": "^2.0.0",
+ "source-map": "^0.6.1"
+ }
+ },
+ "node_modules/get-stream": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
+ "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
+ "dev": true,
+ "engines": {
+ "node": ">=16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/glob": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+ "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+ "deprecated": "Glob versions prior to v9 are no longer supported",
+ "dev": true,
+ "dependencies": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^5.0.1",
+ "once": "^1.3.0"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/glob-to-regexp": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+ "dev": true
+ },
+ "node_modules/hasown": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+ "dev": true,
+ "dependencies": {
+ "function-bind": "^1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/human-signals": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
+ "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=16.17.0"
+ }
+ },
+ "node_modules/inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+ "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+ "dev": true,
+ "dependencies": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "node_modules/inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+ "dev": true
+ },
+ "node_modules/is-binary-path": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+ "dev": true,
+ "dependencies": {
+ "binary-extensions": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/is-core-module": {
+ "version": "2.13.1",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+ "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+ "dev": true,
+ "dependencies": {
+ "hasown": "^2.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.12.0"
+ }
+ },
+ "node_modules/is-stream": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+ "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+ "dev": true,
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+ "dev": true
+ },
+ "node_modules/js-tokens": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz",
+ "integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==",
+ "dev": true
+ },
+ "node_modules/json5": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+ "dev": true,
+ "bin": {
+ "json5": "lib/cli.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/local-pkg": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz",
+ "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==",
+ "dev": true,
+ "dependencies": {
+ "mlly": "^1.4.2",
+ "pkg-types": "^1.0.3"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ }
+ },
+ "node_modules/loupe": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+ "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
+ "dev": true,
+ "dependencies": {
+ "get-func-name": "^2.0.1"
+ }
+ },
+ "node_modules/magic-string": {
+ "version": "0.30.10",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
+ "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
+ "dev": true,
+ "dependencies": {
+ "@jridgewell/sourcemap-codec": "^1.4.15"
+ }
+ },
+ "node_modules/merge-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+ "dev": true
+ },
+ "node_modules/mime": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
+ "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+ "dev": true,
+ "bin": {
+ "mime": "cli.js"
+ },
+ "engines": {
+ "node": ">=10.0.0"
+ }
+ },
+ "node_modules/mimic-fn": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+ "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/miniflare": {
+ "version": "3.20240405.1",
+ "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-3.20240405.1.tgz",
+ "integrity": "sha512-oShOR/ckr9JTO1bkPQH0nXvuSgJjoE+E5+M1tvP01Q8Z+Q0GJnzU2+FDYUH8yIK/atHv7snU8yy0X6KWVn1YdQ==",
+ "dev": true,
+ "dependencies": {
+ "@cspotcode/source-map-support": "0.8.1",
+ "acorn": "^8.8.0",
+ "acorn-walk": "^8.2.0",
+ "capnp-ts": "^0.7.0",
+ "exit-hook": "^2.2.1",
+ "glob-to-regexp": "^0.4.1",
+ "stoppable": "^1.1.0",
+ "undici": "^5.28.2",
+ "workerd": "1.20240405.0",
+ "ws": "^8.11.0",
+ "youch": "^3.2.2",
+ "zod": "^3.20.6"
+ },
+ "bin": {
+ "miniflare": "bootstrap.js"
+ },
+ "engines": {
+ "node": ">=16.13"
+ }
+ },
+ "node_modules/minimatch": {
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+ "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+ "dev": true,
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/mlly": {
+ "version": "1.7.1",
+ "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz",
+ "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==",
+ "dev": true,
+ "dependencies": {
+ "acorn": "^8.11.3",
+ "pathe": "^1.1.2",
+ "pkg-types": "^1.1.1",
+ "ufo": "^1.5.3"
+ }
+ },
+ "node_modules/ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
+ "node_modules/mustache": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
+ "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
+ "dev": true,
+ "bin": {
+ "mustache": "bin/mustache"
+ }
+ },
+ "node_modules/nanoid": {
+ "version": "3.3.7",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+ "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "bin": {
+ "nanoid": "bin/nanoid.cjs"
+ },
+ "engines": {
+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ }
+ },
+ "node_modules/node-forge": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+ "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+ "dev": true,
+ "engines": {
+ "node": ">= 6.13.0"
+ }
+ },
+ "node_modules/normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/npm-run-path": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+ "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
+ "dev": true,
+ "dependencies": {
+ "path-key": "^4.0.0"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/npm-run-path/node_modules/path-key": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+ "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+ "dev": true,
+ "dependencies": {
+ "wrappy": "1"
+ }
+ },
+ "node_modules/onetime": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+ "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+ "dev": true,
+ "dependencies": {
+ "mimic-fn": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/p-limit": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz",
+ "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==",
+ "dev": true,
+ "dependencies": {
+ "yocto-queue": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/path-key": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/path-parse": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+ "dev": true
+ },
+ "node_modules/path-to-regexp": {
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
+ "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",
+ "dev": true
+ },
+ "node_modules/pathe": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+ "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+ "dev": true
+ },
+ "node_modules/pathval": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+ "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+ "dev": true,
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/picocolors": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+ "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+ "dev": true
+ },
+ "node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true,
+ "engines": {
+ "node": ">=8.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "node_modules/pkg-types": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.1.tgz",
+ "integrity": "sha512-ko14TjmDuQJ14zsotODv7dBlwxKhUKQEhuhmbqo1uCi9BB0Z2alo/wAXg6q1dTR5TyuqYyWhjtfe/Tsh+X28jQ==",
+ "dev": true,
+ "dependencies": {
+ "confbox": "^0.1.7",
+ "mlly": "^1.7.0",
+ "pathe": "^1.1.2"
+ }
+ },
+ "node_modules/postcss": {
+ "version": "8.4.38",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+ "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+ "dev": true,
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "dependencies": {
+ "nanoid": "^3.3.7",
+ "picocolors": "^1.0.0",
+ "source-map-js": "^1.2.0"
+ },
+ "engines": {
+ "node": "^10 || ^12 || >=14"
+ }
+ },
+ "node_modules/pretty-format": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+ "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+ "dev": true,
+ "dependencies": {
+ "@jest/schemas": "^29.6.3",
+ "ansi-styles": "^5.0.0",
+ "react-is": "^18.0.0"
+ },
+ "engines": {
+ "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+ }
+ },
+ "node_modules/printable-characters": {
+ "version": "1.0.42",
+ "resolved": "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.42.tgz",
+ "integrity": "sha512-dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ==",
+ "dev": true
+ },
+ "node_modules/react-is": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+ "dev": true
+ },
+ "node_modules/readdirp": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+ "dev": true,
+ "dependencies": {
+ "picomatch": "^2.2.1"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/resolve": {
+ "version": "1.22.8",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+ "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+ "dev": true,
+ "dependencies": {
+ "is-core-module": "^2.13.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
+ },
+ "bin": {
+ "resolve": "bin/resolve"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/resolve.exports": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+ "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/rollup": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
+ "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
+ "dev": true,
+ "dependencies": {
+ "@types/estree": "1.0.5"
+ },
+ "bin": {
+ "rollup": "dist/bin/rollup"
+ },
+ "engines": {
+ "node": ">=18.0.0",
+ "npm": ">=8.0.0"
+ },
+ "optionalDependencies": {
+ "@rollup/rollup-android-arm-eabi": "4.18.0",
+ "@rollup/rollup-android-arm64": "4.18.0",
+ "@rollup/rollup-darwin-arm64": "4.18.0",
+ "@rollup/rollup-darwin-x64": "4.18.0",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
+ "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
+ "@rollup/rollup-linux-arm64-gnu": "4.18.0",
+ "@rollup/rollup-linux-arm64-musl": "4.18.0",
+ "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
+ "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
+ "@rollup/rollup-linux-s390x-gnu": "4.18.0",
+ "@rollup/rollup-linux-x64-gnu": "4.18.0",
+ "@rollup/rollup-linux-x64-musl": "4.18.0",
+ "@rollup/rollup-win32-arm64-msvc": "4.18.0",
+ "@rollup/rollup-win32-ia32-msvc": "4.18.0",
+ "@rollup/rollup-win32-x64-msvc": "4.18.0",
+ "fsevents": "~2.3.2"
+ }
+ },
+ "node_modules/rollup-plugin-inject": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz",
+ "integrity": "sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==",
+ "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-inject.",
+ "dev": true,
+ "dependencies": {
+ "estree-walker": "^0.6.1",
+ "magic-string": "^0.25.3",
+ "rollup-pluginutils": "^2.8.1"
+ }
+ },
+ "node_modules/rollup-plugin-inject/node_modules/estree-walker": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+ "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+ "dev": true
+ },
+ "node_modules/rollup-plugin-inject/node_modules/magic-string": {
+ "version": "0.25.9",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+ "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+ "dev": true,
+ "dependencies": {
+ "sourcemap-codec": "^1.4.8"
+ }
+ },
+ "node_modules/rollup-plugin-node-polyfills": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz",
+ "integrity": "sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==",
+ "dev": true,
+ "dependencies": {
+ "rollup-plugin-inject": "^3.0.0"
+ }
+ },
+ "node_modules/rollup-pluginutils": {
+ "version": "2.8.2",
+ "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
+ "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
+ "dev": true,
+ "dependencies": {
+ "estree-walker": "^0.6.1"
+ }
+ },
+ "node_modules/rollup-pluginutils/node_modules/estree-walker": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+ "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+ "dev": true
+ },
+ "node_modules/safe-stable-stringify": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
+ "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==",
+ "dev": true,
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/selfsigned": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+ "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
+ "dev": true,
+ "dependencies": {
+ "@types/node-forge": "^1.3.0",
+ "node-forge": "^1"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/shebang-command": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+ "dev": true,
+ "dependencies": {
+ "shebang-regex": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/shebang-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/siginfo": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+ "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+ "dev": true
+ },
+ "node_modules/signal-exit": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+ "dev": true,
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/source-map-js": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+ "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+ "dev": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/sourcemap-codec": {
+ "version": "1.4.8",
+ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+ "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+ "deprecated": "Please use @jridgewell/sourcemap-codec instead",
+ "dev": true
+ },
+ "node_modules/stackback": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+ "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+ "dev": true
+ },
+ "node_modules/stacktracey": {
+ "version": "2.1.8",
+ "resolved": "https://registry.npmjs.org/stacktracey/-/stacktracey-2.1.8.tgz",
+ "integrity": "sha512-Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw==",
+ "dev": true,
+ "dependencies": {
+ "as-table": "^1.0.36",
+ "get-source": "^2.0.12"
+ }
+ },
+ "node_modules/std-env": {
+ "version": "3.7.0",
+ "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
+ "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
+ "dev": true
+ },
+ "node_modules/stoppable": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
+ "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4",
+ "npm": ">=6"
+ }
+ },
+ "node_modules/strip-final-newline": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+ "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/strip-literal": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.0.tgz",
+ "integrity": "sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==",
+ "dev": true,
+ "dependencies": {
+ "js-tokens": "^9.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antfu"
+ }
+ },
+ "node_modules/supports-preserve-symlinks-flag": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/tinybench": {
+ "version": "2.8.0",
+ "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.8.0.tgz",
+ "integrity": "sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==",
+ "dev": true
+ },
+ "node_modules/tinypool": {
+ "version": "0.8.4",
+ "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.4.tgz",
+ "integrity": "sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==",
+ "dev": true,
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/tinyspy": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz",
+ "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==",
+ "dev": true,
+ "engines": {
+ "node": ">=14.0.0"
+ }
+ },
+ "node_modules/to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "dependencies": {
+ "is-number": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=8.0"
+ }
+ },
+ "node_modules/ts-json-schema-generator": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-1.5.1.tgz",
+ "integrity": "sha512-apX5qG2+NA66j7b4AJm8q/DpdTeOsjfh7A3LpKsUiil0FepkNwtN28zYgjrsiiya2/OPhsr/PSjX5FUYg79rCg==",
+ "dev": true,
+ "dependencies": {
+ "@types/json-schema": "^7.0.15",
+ "commander": "^12.0.0",
+ "glob": "^8.0.3",
+ "json5": "^2.2.3",
+ "normalize-path": "^3.0.0",
+ "safe-stable-stringify": "^2.4.3",
+ "typescript": "~5.4.2"
+ },
+ "bin": {
+ "ts-json-schema-generator": "bin/ts-json-schema-generator"
+ },
+ "engines": {
+ "node": ">=10.0.0"
+ }
+ },
+ "node_modules/tslib": {
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+ "dev": true
+ },
+ "node_modules/type-detect": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+ "dev": true,
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/typescript": {
+ "version": "5.4.5",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+ "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+ "dev": true,
+ "bin": {
+ "tsc": "bin/tsc",
+ "tsserver": "bin/tsserver"
+ },
+ "engines": {
+ "node": ">=14.17"
+ }
+ },
+ "node_modules/ufo": {
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz",
+ "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==",
+ "dev": true
+ },
+ "node_modules/undici": {
+ "version": "5.28.4",
+ "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
+ "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
+ "dev": true,
+ "dependencies": {
+ "@fastify/busboy": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=14.0"
+ }
+ },
+ "node_modules/undici-types": {
+ "version": "5.26.5",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+ "dev": true
+ },
+ "node_modules/vite": {
+ "version": "5.2.12",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz",
+ "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==",
+ "dev": true,
+ "dependencies": {
+ "esbuild": "^0.20.1",
+ "postcss": "^8.4.38",
+ "rollup": "^4.13.0"
+ },
+ "bin": {
+ "vite": "bin/vite.js"
+ },
+ "engines": {
+ "node": "^18.0.0 || >=20.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/vitejs/vite?sponsor=1"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.3"
+ },
+ "peerDependencies": {
+ "@types/node": "^18.0.0 || >=20.0.0",
+ "less": "*",
+ "lightningcss": "^1.21.0",
+ "sass": "*",
+ "stylus": "*",
+ "sugarss": "*",
+ "terser": "^5.4.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/node": {
+ "optional": true
+ },
+ "less": {
+ "optional": true
+ },
+ "lightningcss": {
+ "optional": true
+ },
+ "sass": {
+ "optional": true
+ },
+ "stylus": {
+ "optional": true
+ },
+ "sugarss": {
+ "optional": true
+ },
+ "terser": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/vite-node": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.3.0.tgz",
+ "integrity": "sha512-D/oiDVBw75XMnjAXne/4feCkCEwcbr2SU1bjAhCcfI5Bq3VoOHji8/wCPAfUkDIeohJ5nSZ39fNxM3dNZ6OBOA==",
+ "dev": true,
+ "dependencies": {
+ "cac": "^6.7.14",
+ "debug": "^4.3.4",
+ "pathe": "^1.1.1",
+ "picocolors": "^1.0.0",
+ "vite": "^5.0.0"
+ },
+ "bin": {
+ "vite-node": "vite-node.mjs"
+ },
+ "engines": {
+ "node": "^18.0.0 || >=20.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/vitest"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/android-arm": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+ "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/android-arm64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+ "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/android-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+ "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
+ "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/darwin-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+ "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+ "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+ "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/linux-arm": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+ "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/linux-arm64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+ "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/linux-ia32": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+ "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/linux-loong64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+ "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+ "cpu": [
+ "loong64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+ "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+ "cpu": [
+ "mips64el"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+ "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+ "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/linux-s390x": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+ "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/linux-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+ "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+ "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+ "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/sunos-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+ "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "sunos"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/win32-arm64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+ "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/win32-ia32": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+ "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/@esbuild/win32-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+ "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/vite/node_modules/esbuild": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+ "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+ "dev": true,
+ "hasInstallScript": true,
+ "bin": {
+ "esbuild": "bin/esbuild"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "optionalDependencies": {
+ "@esbuild/aix-ppc64": "0.20.2",
+ "@esbuild/android-arm": "0.20.2",
+ "@esbuild/android-arm64": "0.20.2",
+ "@esbuild/android-x64": "0.20.2",
+ "@esbuild/darwin-arm64": "0.20.2",
+ "@esbuild/darwin-x64": "0.20.2",
+ "@esbuild/freebsd-arm64": "0.20.2",
+ "@esbuild/freebsd-x64": "0.20.2",
+ "@esbuild/linux-arm": "0.20.2",
+ "@esbuild/linux-arm64": "0.20.2",
+ "@esbuild/linux-ia32": "0.20.2",
+ "@esbuild/linux-loong64": "0.20.2",
+ "@esbuild/linux-mips64el": "0.20.2",
+ "@esbuild/linux-ppc64": "0.20.2",
+ "@esbuild/linux-riscv64": "0.20.2",
+ "@esbuild/linux-s390x": "0.20.2",
+ "@esbuild/linux-x64": "0.20.2",
+ "@esbuild/netbsd-x64": "0.20.2",
+ "@esbuild/openbsd-x64": "0.20.2",
+ "@esbuild/sunos-x64": "0.20.2",
+ "@esbuild/win32-arm64": "0.20.2",
+ "@esbuild/win32-ia32": "0.20.2",
+ "@esbuild/win32-x64": "0.20.2"
+ }
+ },
+ "node_modules/vitest": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.3.0.tgz",
+ "integrity": "sha512-V9qb276J1jjSx9xb75T2VoYXdO1UKi+qfflY7V7w93jzX7oA/+RtYE6TcifxksxsZvygSSMwu2Uw6di7yqDMwg==",
+ "dev": true,
+ "dependencies": {
+ "@vitest/expect": "1.3.0",
+ "@vitest/runner": "1.3.0",
+ "@vitest/snapshot": "1.3.0",
+ "@vitest/spy": "1.3.0",
+ "@vitest/utils": "1.3.0",
+ "acorn-walk": "^8.3.2",
+ "chai": "^4.3.10",
+ "debug": "^4.3.4",
+ "execa": "^8.0.1",
+ "local-pkg": "^0.5.0",
+ "magic-string": "^0.30.5",
+ "pathe": "^1.1.1",
+ "picocolors": "^1.0.0",
+ "std-env": "^3.5.0",
+ "strip-literal": "^2.0.0",
+ "tinybench": "^2.5.1",
+ "tinypool": "^0.8.2",
+ "vite": "^5.0.0",
+ "vite-node": "1.3.0",
+ "why-is-node-running": "^2.2.2"
+ },
+ "bin": {
+ "vitest": "vitest.mjs"
+ },
+ "engines": {
+ "node": "^18.0.0 || >=20.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/vitest"
+ },
+ "peerDependencies": {
+ "@edge-runtime/vm": "*",
+ "@types/node": "^18.0.0 || >=20.0.0",
+ "@vitest/browser": "1.3.0",
+ "@vitest/ui": "1.3.0",
+ "happy-dom": "*",
+ "jsdom": "*"
+ },
+ "peerDependenciesMeta": {
+ "@edge-runtime/vm": {
+ "optional": true
+ },
+ "@types/node": {
+ "optional": true
+ },
+ "@vitest/browser": {
+ "optional": true
+ },
+ "@vitest/ui": {
+ "optional": true
+ },
+ "happy-dom": {
+ "optional": true
+ },
+ "jsdom": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dev": true,
+ "dependencies": {
+ "isexe": "^2.0.0"
+ },
+ "bin": {
+ "node-which": "bin/node-which"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/why-is-node-running": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
+ "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
+ "dev": true,
+ "dependencies": {
+ "siginfo": "^2.0.0",
+ "stackback": "0.0.2"
+ },
+ "bin": {
+ "why-is-node-running": "cli.js"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/workerd": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20240405.0.tgz",
+ "integrity": "sha512-AWrOSBh4Ll7sBWHuh0aywm8hDkKqsZmcwnDB0PVGszWZM5mndNBI5iJ/8haXVpdoyqkJQEVdhET9JDi4yU8tRg==",
+ "dev": true,
+ "hasInstallScript": true,
+ "bin": {
+ "workerd": "bin/workerd"
+ },
+ "engines": {
+ "node": ">=16"
+ },
+ "optionalDependencies": {
+ "@cloudflare/workerd-darwin-64": "1.20240405.0",
+ "@cloudflare/workerd-darwin-arm64": "1.20240405.0",
+ "@cloudflare/workerd-linux-64": "1.20240405.0",
+ "@cloudflare/workerd-linux-arm64": "1.20240405.0",
+ "@cloudflare/workerd-windows-64": "1.20240405.0"
+ }
+ },
+ "node_modules/wrangler": {
+ "version": "3.59.0",
+ "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-3.59.0.tgz",
+ "integrity": "sha512-MLKejazUJrekbD8EnQfN6d7fei+IGnq2aVXeILFDy0aTktVNXKvO+eC+mND1zOr+k0KvQN4sJo8vGwqYoY7btw==",
+ "dev": true,
+ "dependencies": {
+ "@cloudflare/kv-asset-handler": "0.3.2",
+ "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
+ "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
+ "blake3-wasm": "^2.1.5",
+ "chokidar": "^3.5.3",
+ "esbuild": "0.17.19",
+ "miniflare": "3.20240524.2",
+ "nanoid": "^3.3.3",
+ "path-to-regexp": "^6.2.0",
+ "resolve": "^1.22.8",
+ "resolve.exports": "^2.0.2",
+ "selfsigned": "^2.0.1",
+ "source-map": "0.6.1",
+ "xxhash-wasm": "^1.0.1"
+ },
+ "bin": {
+ "wrangler": "bin/wrangler.js",
+ "wrangler2": "bin/wrangler.js"
+ },
+ "engines": {
+ "node": ">=16.17.0"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.2"
+ },
+ "peerDependencies": {
+ "@cloudflare/workers-types": "^4.20240524.0"
+ },
+ "peerDependenciesMeta": {
+ "@cloudflare/workers-types": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/wrangler/node_modules/@cloudflare/workerd-darwin-64": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20240524.0.tgz",
+ "integrity": "sha512-ATaXjefbTsrv4mpn4Fdua114RRDXcX5Ky+Mv+f4JTUllgalmqC4CYMN4jxRz9IpJU/fNMN8IEfvUyuJBAcl9Iw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/wrangler/node_modules/@cloudflare/workerd-darwin-arm64": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20240524.0.tgz",
+ "integrity": "sha512-wnbsZI4CS0QPCd+wnBHQ40C28A/2Qo4ESi1YhE2735G3UNcc876MWksZhsubd+XH0XPIra6eNFqyw6wRMpQOXA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/wrangler/node_modules/@cloudflare/workerd-linux-64": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20240524.0.tgz",
+ "integrity": "sha512-E8mj+HPBryKwaJAiNsYzXtVjKCL0KvUBZbtxJxlWM4mLSQhT+uwGT3nydb/hFY59rZnQgZslw0oqEWht5TEYiQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/wrangler/node_modules/@cloudflare/workerd-linux-arm64": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20240524.0.tgz",
+ "integrity": "sha512-/Fr1W671t2triNCDCBWdStxngnbUfZunZ/2e4kaMLzJDJLYDtYdmvOUCBDzUD4ssqmIMbn9RCQQ0U+CLEoqBqw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/wrangler/node_modules/@cloudflare/workerd-windows-64": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20240524.0.tgz",
+ "integrity": "sha512-G+ThDEx57g9mAEKqhWnHaaJgpeGYtyhkmwM/BDpLqPks/rAY5YEfZbY4YL1pNk1kkcZDXGrwIsY8xe9Apf5JdA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=16"
+ }
+ },
+ "node_modules/wrangler/node_modules/miniflare": {
+ "version": "3.20240524.2",
+ "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-3.20240524.2.tgz",
+ "integrity": "sha512-Js+8cB61KJG0z2HuQTPLT9S6FwTBuMZfjtml3azUarLYsCF91N+PhIkvNpbkwCXcfRvscdjJ0RlT6lBQYEuIwA==",
+ "dev": true,
+ "dependencies": {
+ "@cspotcode/source-map-support": "0.8.1",
+ "acorn": "^8.8.0",
+ "acorn-walk": "^8.2.0",
+ "capnp-ts": "^0.7.0",
+ "exit-hook": "^2.2.1",
+ "glob-to-regexp": "^0.4.1",
+ "stoppable": "^1.1.0",
+ "undici": "^5.28.2",
+ "workerd": "1.20240524.0",
+ "ws": "^8.11.0",
+ "youch": "^3.2.2",
+ "zod": "^3.20.6"
+ },
+ "bin": {
+ "miniflare": "bootstrap.js"
+ },
+ "engines": {
+ "node": ">=16.13"
+ }
+ },
+ "node_modules/wrangler/node_modules/workerd": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20240524.0.tgz",
+ "integrity": "sha512-LWLe5D8PVHBcqturmBbwgI71r7YPpIMYZoVEH6S4G35EqIJ55cb0n3FipoSyraoIfpcCxCFxX1K6WsRHbP3pFA==",
+ "dev": true,
+ "hasInstallScript": true,
+ "bin": {
+ "workerd": "bin/workerd"
+ },
+ "engines": {
+ "node": ">=16"
+ },
+ "optionalDependencies": {
+ "@cloudflare/workerd-darwin-64": "1.20240524.0",
+ "@cloudflare/workerd-darwin-arm64": "1.20240524.0",
+ "@cloudflare/workerd-linux-64": "1.20240524.0",
+ "@cloudflare/workerd-linux-arm64": "1.20240524.0",
+ "@cloudflare/workerd-windows-64": "1.20240524.0"
+ }
+ },
+ "node_modules/wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+ "dev": true
+ },
+ "node_modules/ws": {
+ "version": "8.17.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
+ "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+ "dev": true,
+ "engines": {
+ "node": ">=10.0.0"
+ },
+ "peerDependencies": {
+ "bufferutil": "^4.0.1",
+ "utf-8-validate": ">=5.0.2"
+ },
+ "peerDependenciesMeta": {
+ "bufferutil": {
+ "optional": true
+ },
+ "utf-8-validate": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/xxhash-wasm": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-1.0.2.tgz",
+ "integrity": "sha512-ibF0Or+FivM9lNrg+HGJfVX8WJqgo+kCLDc4vx6xMeTce7Aj+DLttKbxxRR/gNLSAelRc1omAPlJ77N/Jem07A==",
+ "dev": true
+ },
+ "node_modules/yocto-queue": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+ "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+ "dev": true,
+ "engines": {
+ "node": ">=12.20"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/youch": {
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/youch/-/youch-3.3.3.tgz",
+ "integrity": "sha512-qSFXUk3UZBLfggAW3dJKg0BMblG5biqSF8M34E06o5CSsZtH92u9Hqmj2RzGiHDi64fhe83+4tENFP2DB6t6ZA==",
+ "dev": true,
+ "dependencies": {
+ "cookie": "^0.5.0",
+ "mustache": "^4.2.0",
+ "stacktracey": "^2.1.8"
+ }
+ },
+ "node_modules/zod": {
+ "version": "3.23.8",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+ "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+ "dev": true,
+ "funding": {
+ "url": "https://github.com/sponsors/colinhacks"
+ }
+ }
+ },
+ "dependencies": {
+ "@cloudflare/kv-asset-handler": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.3.2.tgz",
+ "integrity": "sha512-EeEjMobfuJrwoctj7FA1y1KEbM0+Q1xSjobIEyie9k4haVEBB7vkDvsasw1pM3rO39mL2akxIAzLMUAtrMHZhA==",
+ "dev": true,
+ "requires": {
+ "mime": "^3.0.0"
+ }
+ },
+ "@cloudflare/vitest-pool-workers": {
+ "version": "0.1.19",
+ "resolved": "https://registry.npmjs.org/@cloudflare/vitest-pool-workers/-/vitest-pool-workers-0.1.19.tgz",
+ "integrity": "sha512-fb3rxrihwd4OsBf4mALlezo6nnuL5p/BopGu47MeV5LlTjP3sGFT1QYbXsdv6rfNsxBGSP7uAahCWBhTsNFy0w==",
+ "dev": true,
+ "requires": {
+ "birpc": "0.2.14",
+ "cjs-module-lexer": "^1.2.3",
+ "devalue": "^4.3.0",
+ "esbuild": "0.17.19",
+ "miniflare": "3.20240405.1",
+ "wrangler": "3.50.0",
+ "zod": "^3.20.6"
+ },
+ "dependencies": {
+ "@cloudflare/kv-asset-handler": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.3.1.tgz",
+ "integrity": "sha512-lKN2XCfKCmpKb86a1tl4GIwsJYDy9TGuwjhDELLmpKygQhw8X2xR4dusgpC5Tg7q1pB96Eb0rBo81kxSILQMwA==",
+ "dev": true,
+ "requires": {
+ "mime": "^3.0.0"
+ }
+ },
+ "wrangler": {
+ "version": "3.50.0",
+ "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-3.50.0.tgz",
+ "integrity": "sha512-JlLuch+6DtaC5HGp8YD9Au++XvMv34g3ySdlB5SyPbaObELi8P9ZID5vgyf9AA75djzxL7cuNOk1YdKCJEuq0w==",
+ "dev": true,
+ "requires": {
+ "@cloudflare/kv-asset-handler": "0.3.1",
+ "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
+ "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
+ "blake3-wasm": "^2.1.5",
+ "chokidar": "^3.5.3",
+ "esbuild": "0.17.19",
+ "fsevents": "~2.3.2",
+ "miniflare": "3.20240405.1",
+ "nanoid": "^3.3.3",
+ "path-to-regexp": "^6.2.0",
+ "resolve": "^1.22.8",
+ "resolve.exports": "^2.0.2",
+ "selfsigned": "^2.0.1",
+ "source-map": "0.6.1",
+ "ts-json-schema-generator": "^1.5.0",
+ "xxhash-wasm": "^1.0.1"
+ }
+ }
+ }
+ },
+ "@cloudflare/workerd-darwin-64": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20240405.0.tgz",
+ "integrity": "sha512-ut8kwpHmlz9dNSjoov6v1b6jS50J46Mj9QcMA0t1Hne36InaQk/qqPSd12fN5p2GesZ9OOBJvBdDsTblVdyJ1w==",
+ "dev": true,
+ "optional": true
+ },
+ "@cloudflare/workerd-darwin-arm64": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20240405.0.tgz",
+ "integrity": "sha512-x3A3Ym+J2DH1uYnw0aedeKOTnUebEo312+Aladv7bFri97pjRJcqVbYhMtOHLkHjwYn7bpKSY2eL5iM+0XT29A==",
+ "dev": true,
+ "optional": true
+ },
+ "@cloudflare/workerd-linux-64": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20240405.0.tgz",
+ "integrity": "sha512-3tYpfjtxEQ0R30Pna7OF3Bz0CTx30hc0QNtH61KnkvXtaeYMkWutSKQKXIuVlPa/7v1MHp+8ViBXMflmS7HquA==",
+ "dev": true,
+ "optional": true
+ },
+ "@cloudflare/workerd-linux-arm64": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20240405.0.tgz",
+ "integrity": "sha512-NpKZlvmdgcX/m4tP5zM91AfJpZrue2/GRA+Sl3szxAivu2uE5jDVf5SS9dzqzCVfPrdhylqH7yeL4U/cafFNOg==",
+ "dev": true,
+ "optional": true
+ },
+ "@cloudflare/workerd-windows-64": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20240405.0.tgz",
+ "integrity": "sha512-REBeJMxvUCjwuEVzSSIBtzAyM69QjToab8qBst0S9vdih+9DObym4dw8CevdBQhDbFrHiyL9E6pAZpLPNHVgCw==",
+ "dev": true,
+ "optional": true
+ },
+ "@cloudflare/workers-types": {
+ "version": "4.20240603.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20240603.0.tgz",
+ "integrity": "sha512-KmsjZcd/dPWM51FoT08cvUGCq9l3nFEriloQ12mcdJPoW911Gi5S/9Cq4xeFvTrtk9TJ2krvxP23IeobecRmOQ==",
+ "dev": true
+ },
+ "@cspotcode/source-map-support": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+ "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/trace-mapping": "0.3.9"
+ }
+ },
+ "@esbuild-plugins/node-globals-polyfill": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/@esbuild-plugins/node-globals-polyfill/-/node-globals-polyfill-0.2.3.tgz",
+ "integrity": "sha512-r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw==",
+ "dev": true,
+ "requires": {}
+ },
+ "@esbuild-plugins/node-modules-polyfill": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/@esbuild-plugins/node-modules-polyfill/-/node-modules-polyfill-0.2.2.tgz",
+ "integrity": "sha512-LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA==",
+ "dev": true,
+ "requires": {
+ "escape-string-regexp": "^4.0.0",
+ "rollup-plugin-node-polyfills": "^0.2.1"
+ }
+ },
+ "@esbuild/aix-ppc64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+ "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/android-arm": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz",
+ "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/android-arm64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz",
+ "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/android-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz",
+ "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/darwin-arm64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz",
+ "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/darwin-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz",
+ "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/freebsd-arm64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz",
+ "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/freebsd-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz",
+ "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-arm": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz",
+ "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-arm64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz",
+ "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-ia32": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz",
+ "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-loong64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz",
+ "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-mips64el": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz",
+ "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-ppc64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz",
+ "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-riscv64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz",
+ "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-s390x": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz",
+ "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz",
+ "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/netbsd-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz",
+ "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/openbsd-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz",
+ "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/sunos-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz",
+ "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/win32-arm64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz",
+ "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/win32-ia32": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz",
+ "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/win32-x64": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz",
+ "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==",
+ "dev": true,
+ "optional": true
+ },
+ "@fastify/busboy": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
+ "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
+ "dev": true
+ },
+ "@jest/schemas": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+ "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+ "dev": true,
+ "requires": {
+ "@sinclair/typebox": "^0.27.8"
+ }
+ },
+ "@jridgewell/resolve-uri": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+ "dev": true
+ },
+ "@jridgewell/sourcemap-codec": {
+ "version": "1.4.15",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+ "dev": true
+ },
+ "@jridgewell/trace-mapping": {
+ "version": "0.3.9",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+ "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/resolve-uri": "^3.0.3",
+ "@jridgewell/sourcemap-codec": "^1.4.10"
+ }
+ },
+ "@rollup/rollup-android-arm-eabi": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
+ "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-android-arm64": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
+ "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-darwin-arm64": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
+ "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-darwin-x64": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
+ "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-linux-arm-gnueabihf": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
+ "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-linux-arm-musleabihf": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
+ "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-linux-arm64-gnu": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
+ "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-linux-arm64-musl": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
+ "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-linux-powerpc64le-gnu": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
+ "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-linux-riscv64-gnu": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
+ "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-linux-s390x-gnu": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
+ "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-linux-x64-gnu": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
+ "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-linux-x64-musl": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
+ "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-win32-arm64-msvc": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
+ "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-win32-ia32-msvc": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
+ "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
+ "dev": true,
+ "optional": true
+ },
+ "@rollup/rollup-win32-x64-msvc": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
+ "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
+ "dev": true,
+ "optional": true
+ },
+ "@sinclair/typebox": {
+ "version": "0.27.8",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+ "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+ "dev": true
+ },
+ "@types/estree": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+ "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+ "dev": true
+ },
+ "@types/json-schema": {
+ "version": "7.0.15",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+ "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+ "dev": true
+ },
+ "@types/node": {
+ "version": "20.14.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz",
+ "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==",
+ "dev": true,
+ "requires": {
+ "undici-types": "~5.26.4"
+ }
+ },
+ "@types/node-forge": {
+ "version": "1.3.11",
+ "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+ "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+ "dev": true,
+ "requires": {
+ "@types/node": "*"
+ }
+ },
+ "@vitest/expect": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.3.0.tgz",
+ "integrity": "sha512-7bWt0vBTZj08B+Ikv70AnLRicohYwFgzNjFqo9SxxqHHxSlUJGSXmCRORhOnRMisiUryKMdvsi1n27Bc6jL9DQ==",
+ "dev": true,
+ "requires": {
+ "@vitest/spy": "1.3.0",
+ "@vitest/utils": "1.3.0",
+ "chai": "^4.3.10"
+ }
+ },
+ "@vitest/runner": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.3.0.tgz",
+ "integrity": "sha512-1Jb15Vo/Oy7mwZ5bXi7zbgszsdIBNjc4IqP8Jpr/8RdBC4nF1CTzIAn2dxYvpF1nGSseeL39lfLQ2uvs5u1Y9A==",
+ "dev": true,
+ "requires": {
+ "@vitest/utils": "1.3.0",
+ "p-limit": "^5.0.0",
+ "pathe": "^1.1.1"
+ }
+ },
+ "@vitest/snapshot": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.3.0.tgz",
+ "integrity": "sha512-swmktcviVVPYx9U4SEQXLV6AEY51Y6bZ14jA2yo6TgMxQ3h+ZYiO0YhAHGJNp0ohCFbPAis1R9kK0cvN6lDPQA==",
+ "dev": true,
+ "requires": {
+ "magic-string": "^0.30.5",
+ "pathe": "^1.1.1",
+ "pretty-format": "^29.7.0"
+ }
+ },
+ "@vitest/spy": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.3.0.tgz",
+ "integrity": "sha512-AkCU0ThZunMvblDpPKgjIi025UxR8V7MZ/g/EwmAGpjIujLVV2X6rGYGmxE2D4FJbAy0/ijdROHMWa2M/6JVMw==",
+ "dev": true,
+ "requires": {
+ "tinyspy": "^2.2.0"
+ }
+ },
+ "@vitest/utils": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.3.0.tgz",
+ "integrity": "sha512-/LibEY/fkaXQufi4GDlQZhikQsPO2entBKtfuyIpr1jV4DpaeasqkeHjhdOhU24vSHshcSuEyVlWdzvv2XmYCw==",
+ "dev": true,
+ "requires": {
+ "diff-sequences": "^29.6.3",
+ "estree-walker": "^3.0.3",
+ "loupe": "^2.3.7",
+ "pretty-format": "^29.7.0"
+ }
+ },
+ "acorn": {
+ "version": "8.11.3",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+ "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+ "dev": true
+ },
+ "acorn-walk": {
+ "version": "8.3.2",
+ "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+ "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+ "dev": true
+ },
+ "anymatch": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+ "dev": true,
+ "requires": {
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
+ }
+ },
+ "as-table": {
+ "version": "1.0.55",
+ "resolved": "https://registry.npmjs.org/as-table/-/as-table-1.0.55.tgz",
+ "integrity": "sha512-xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ==",
+ "dev": true,
+ "requires": {
+ "printable-characters": "^1.0.42"
+ }
+ },
+ "assertion-error": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+ "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+ "dev": true
+ },
+ "balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+ "dev": true
+ },
+ "binary-extensions": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+ "dev": true
+ },
+ "birpc": {
+ "version": "0.2.14",
+ "resolved": "https://registry.npmjs.org/birpc/-/birpc-0.2.14.tgz",
+ "integrity": "sha512-37FHE8rqsYM5JEKCnXFyHpBCzvgHEExwVVTq+nUmloInU7l8ezD1TpOhKpS8oe1DTYFqEK27rFZVKG43oTqXRA==",
+ "dev": true
+ },
+ "blake3-wasm": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/blake3-wasm/-/blake3-wasm-2.1.5.tgz",
+ "integrity": "sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==",
+ "dev": true
+ },
+ "brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "braces": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+ "dev": true,
+ "requires": {
+ "fill-range": "^7.1.1"
+ }
+ },
+ "cac": {
+ "version": "6.7.14",
+ "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+ "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+ "dev": true
+ },
+ "capnp-ts": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/capnp-ts/-/capnp-ts-0.7.0.tgz",
+ "integrity": "sha512-XKxXAC3HVPv7r674zP0VC3RTXz+/JKhfyw94ljvF80yynK6VkTnqE3jMuN8b3dUVmmc43TjyxjW4KTsmB3c86g==",
+ "dev": true,
+ "requires": {
+ "debug": "^4.3.1",
+ "tslib": "^2.2.0"
+ }
+ },
+ "chai": {
+ "version": "4.4.1",
+ "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
+ "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
+ "dev": true,
+ "requires": {
+ "assertion-error": "^1.1.0",
+ "check-error": "^1.0.3",
+ "deep-eql": "^4.1.3",
+ "get-func-name": "^2.0.2",
+ "loupe": "^2.3.6",
+ "pathval": "^1.1.1",
+ "type-detect": "^4.0.8"
+ }
+ },
+ "check-error": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
+ "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+ "dev": true,
+ "requires": {
+ "get-func-name": "^2.0.2"
+ }
+ },
+ "chokidar": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+ "dev": true,
+ "requires": {
+ "anymatch": "~3.1.2",
+ "braces": "~3.0.2",
+ "fsevents": "~2.3.2",
+ "glob-parent": "~5.1.2",
+ "is-binary-path": "~2.1.0",
+ "is-glob": "~4.0.1",
+ "normalize-path": "~3.0.0",
+ "readdirp": "~3.6.0"
+ }
+ },
+ "cjs-module-lexer": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
+ "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==",
+ "dev": true
+ },
+ "commander": {
+ "version": "12.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+ "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+ "dev": true
+ },
+ "confbox": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
+ "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==",
+ "dev": true
+ },
+ "cookie": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+ "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+ "dev": true
+ },
+ "cross-spawn": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "dev": true,
+ "requires": {
+ "path-key": "^3.1.0",
+ "shebang-command": "^2.0.0",
+ "which": "^2.0.1"
+ }
+ },
+ "data-uri-to-buffer": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.2.tgz",
+ "integrity": "sha512-ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA==",
+ "dev": true
+ },
+ "debug": {
+ "version": "4.3.5",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+ "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "deep-eql": {
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz",
+ "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==",
+ "dev": true,
+ "requires": {
+ "type-detect": "^4.0.0"
+ }
+ },
+ "devalue": {
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/devalue/-/devalue-4.3.3.tgz",
+ "integrity": "sha512-UH8EL6H2ifcY8TbD2QsxwCC/pr5xSwPvv85LrLXVihmHVC3T3YqTCIwnR5ak0yO1KYqlxrPVOA/JVZJYPy2ATg==",
+ "dev": true
+ },
+ "diff-sequences": {
+ "version": "29.6.3",
+ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+ "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+ "dev": true
+ },
+ "esbuild": {
+ "version": "0.17.19",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz",
+ "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==",
+ "dev": true,
+ "requires": {
+ "@esbuild/android-arm": "0.17.19",
+ "@esbuild/android-arm64": "0.17.19",
+ "@esbuild/android-x64": "0.17.19",
+ "@esbuild/darwin-arm64": "0.17.19",
+ "@esbuild/darwin-x64": "0.17.19",
+ "@esbuild/freebsd-arm64": "0.17.19",
+ "@esbuild/freebsd-x64": "0.17.19",
+ "@esbuild/linux-arm": "0.17.19",
+ "@esbuild/linux-arm64": "0.17.19",
+ "@esbuild/linux-ia32": "0.17.19",
+ "@esbuild/linux-loong64": "0.17.19",
+ "@esbuild/linux-mips64el": "0.17.19",
+ "@esbuild/linux-ppc64": "0.17.19",
+ "@esbuild/linux-riscv64": "0.17.19",
+ "@esbuild/linux-s390x": "0.17.19",
+ "@esbuild/linux-x64": "0.17.19",
+ "@esbuild/netbsd-x64": "0.17.19",
+ "@esbuild/openbsd-x64": "0.17.19",
+ "@esbuild/sunos-x64": "0.17.19",
+ "@esbuild/win32-arm64": "0.17.19",
+ "@esbuild/win32-ia32": "0.17.19",
+ "@esbuild/win32-x64": "0.17.19"
+ }
+ },
+ "escape-string-regexp": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+ "dev": true
+ },
+ "estree-walker": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+ "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+ "dev": true,
+ "requires": {
+ "@types/estree": "^1.0.0"
+ }
+ },
+ "execa": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
+ "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
+ "dev": true,
+ "requires": {
+ "cross-spawn": "^7.0.3",
+ "get-stream": "^8.0.1",
+ "human-signals": "^5.0.0",
+ "is-stream": "^3.0.0",
+ "merge-stream": "^2.0.0",
+ "npm-run-path": "^5.1.0",
+ "onetime": "^6.0.0",
+ "signal-exit": "^4.1.0",
+ "strip-final-newline": "^3.0.0"
+ }
+ },
+ "exit-hook": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-2.2.1.tgz",
+ "integrity": "sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==",
+ "dev": true
+ },
+ "fill-range": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+ "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+ "dev": true
+ },
+ "fsevents": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+ "dev": true,
+ "optional": true
+ },
+ "function-bind": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+ "dev": true
+ },
+ "get-func-name": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
+ "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
+ "dev": true
+ },
+ "get-source": {
+ "version": "2.0.12",
+ "resolved": "https://registry.npmjs.org/get-source/-/get-source-2.0.12.tgz",
+ "integrity": "sha512-X5+4+iD+HoSeEED+uwrQ07BOQr0kEDFMVqqpBuI+RaZBpBpHCuXxo70bjar6f0b0u/DQJsJ7ssurpP0V60Az+w==",
+ "dev": true,
+ "requires": {
+ "data-uri-to-buffer": "^2.0.0",
+ "source-map": "^0.6.1"
+ }
+ },
+ "get-stream": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
+ "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
+ "dev": true
+ },
+ "glob": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+ "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+ "dev": true,
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^5.0.1",
+ "once": "^1.3.0"
+ }
+ },
+ "glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "requires": {
+ "is-glob": "^4.0.1"
+ }
+ },
+ "glob-to-regexp": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+ "dev": true
+ },
+ "hasown": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.2"
+ }
+ },
+ "human-signals": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
+ "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
+ "dev": true
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+ "dev": true,
+ "requires": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+ "dev": true
+ },
+ "is-binary-path": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+ "dev": true,
+ "requires": {
+ "binary-extensions": "^2.0.0"
+ }
+ },
+ "is-core-module": {
+ "version": "2.13.1",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+ "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+ "dev": true,
+ "requires": {
+ "hasown": "^2.0.0"
+ }
+ },
+ "is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "dev": true
+ },
+ "is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "dev": true,
+ "requires": {
+ "is-extglob": "^2.1.1"
+ }
+ },
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true
+ },
+ "is-stream": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+ "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+ "dev": true
+ },
+ "isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+ "dev": true
+ },
+ "js-tokens": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.0.tgz",
+ "integrity": "sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==",
+ "dev": true
+ },
+ "json5": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+ "dev": true
+ },
+ "local-pkg": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz",
+ "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==",
+ "dev": true,
+ "requires": {
+ "mlly": "^1.4.2",
+ "pkg-types": "^1.0.3"
+ }
+ },
+ "loupe": {
+ "version": "2.3.7",
+ "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
+ "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
+ "dev": true,
+ "requires": {
+ "get-func-name": "^2.0.1"
+ }
+ },
+ "magic-string": {
+ "version": "0.30.10",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
+ "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
+ "dev": true,
+ "requires": {
+ "@jridgewell/sourcemap-codec": "^1.4.15"
+ }
+ },
+ "merge-stream": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+ "dev": true
+ },
+ "mime": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
+ "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+ "dev": true
+ },
+ "mimic-fn": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+ "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+ "dev": true
+ },
+ "miniflare": {
+ "version": "3.20240405.1",
+ "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-3.20240405.1.tgz",
+ "integrity": "sha512-oShOR/ckr9JTO1bkPQH0nXvuSgJjoE+E5+M1tvP01Q8Z+Q0GJnzU2+FDYUH8yIK/atHv7snU8yy0X6KWVn1YdQ==",
+ "dev": true,
+ "requires": {
+ "@cspotcode/source-map-support": "0.8.1",
+ "acorn": "^8.8.0",
+ "acorn-walk": "^8.2.0",
+ "capnp-ts": "^0.7.0",
+ "exit-hook": "^2.2.1",
+ "glob-to-regexp": "^0.4.1",
+ "stoppable": "^1.1.0",
+ "undici": "^5.28.2",
+ "workerd": "1.20240405.0",
+ "ws": "^8.11.0",
+ "youch": "^3.2.2",
+ "zod": "^3.20.6"
+ }
+ },
+ "minimatch": {
+ "version": "5.1.6",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+ "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "^2.0.1"
+ }
+ },
+ "mlly": {
+ "version": "1.7.1",
+ "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz",
+ "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==",
+ "dev": true,
+ "requires": {
+ "acorn": "^8.11.3",
+ "pathe": "^1.1.2",
+ "pkg-types": "^1.1.1",
+ "ufo": "^1.5.3"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
+ "mustache": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
+ "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
+ "dev": true
+ },
+ "nanoid": {
+ "version": "3.3.7",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+ "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+ "dev": true
+ },
+ "node-forge": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+ "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+ "dev": true
+ },
+ "normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "dev": true
+ },
+ "npm-run-path": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
+ "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
+ "dev": true,
+ "requires": {
+ "path-key": "^4.0.0"
+ },
+ "dependencies": {
+ "path-key": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+ "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+ "dev": true
+ }
+ }
+ },
+ "once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+ "dev": true,
+ "requires": {
+ "wrappy": "1"
+ }
+ },
+ "onetime": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+ "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+ "dev": true,
+ "requires": {
+ "mimic-fn": "^4.0.0"
+ }
+ },
+ "p-limit": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz",
+ "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==",
+ "dev": true,
+ "requires": {
+ "yocto-queue": "^1.0.0"
+ }
+ },
+ "path-key": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+ "dev": true
+ },
+ "path-parse": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+ "dev": true
+ },
+ "path-to-regexp": {
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
+ "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",
+ "dev": true
+ },
+ "pathe": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+ "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+ "dev": true
+ },
+ "pathval": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+ "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+ "dev": true
+ },
+ "picocolors": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+ "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+ "dev": true
+ },
+ "picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true
+ },
+ "pkg-types": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.1.tgz",
+ "integrity": "sha512-ko14TjmDuQJ14zsotODv7dBlwxKhUKQEhuhmbqo1uCi9BB0Z2alo/wAXg6q1dTR5TyuqYyWhjtfe/Tsh+X28jQ==",
+ "dev": true,
+ "requires": {
+ "confbox": "^0.1.7",
+ "mlly": "^1.7.0",
+ "pathe": "^1.1.2"
+ }
+ },
+ "postcss": {
+ "version": "8.4.38",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+ "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+ "dev": true,
+ "requires": {
+ "nanoid": "^3.3.7",
+ "picocolors": "^1.0.0",
+ "source-map-js": "^1.2.0"
+ }
+ },
+ "pretty-format": {
+ "version": "29.7.0",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+ "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+ "dev": true,
+ "requires": {
+ "@jest/schemas": "^29.6.3",
+ "ansi-styles": "^5.0.0",
+ "react-is": "^18.0.0"
+ }
+ },
+ "printable-characters": {
+ "version": "1.0.42",
+ "resolved": "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.42.tgz",
+ "integrity": "sha512-dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ==",
+ "dev": true
+ },
+ "react-is": {
+ "version": "18.3.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+ "dev": true
+ },
+ "readdirp": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+ "dev": true,
+ "requires": {
+ "picomatch": "^2.2.1"
+ }
+ },
+ "resolve": {
+ "version": "1.22.8",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+ "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+ "dev": true,
+ "requires": {
+ "is-core-module": "^2.13.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
+ }
+ },
+ "resolve.exports": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
+ "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+ "dev": true
+ },
+ "rollup": {
+ "version": "4.18.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
+ "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
+ "dev": true,
+ "requires": {
+ "@rollup/rollup-android-arm-eabi": "4.18.0",
+ "@rollup/rollup-android-arm64": "4.18.0",
+ "@rollup/rollup-darwin-arm64": "4.18.0",
+ "@rollup/rollup-darwin-x64": "4.18.0",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
+ "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
+ "@rollup/rollup-linux-arm64-gnu": "4.18.0",
+ "@rollup/rollup-linux-arm64-musl": "4.18.0",
+ "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
+ "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
+ "@rollup/rollup-linux-s390x-gnu": "4.18.0",
+ "@rollup/rollup-linux-x64-gnu": "4.18.0",
+ "@rollup/rollup-linux-x64-musl": "4.18.0",
+ "@rollup/rollup-win32-arm64-msvc": "4.18.0",
+ "@rollup/rollup-win32-ia32-msvc": "4.18.0",
+ "@rollup/rollup-win32-x64-msvc": "4.18.0",
+ "@types/estree": "1.0.5",
+ "fsevents": "~2.3.2"
+ }
+ },
+ "rollup-plugin-inject": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz",
+ "integrity": "sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==",
+ "dev": true,
+ "requires": {
+ "estree-walker": "^0.6.1",
+ "magic-string": "^0.25.3",
+ "rollup-pluginutils": "^2.8.1"
+ },
+ "dependencies": {
+ "estree-walker": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+ "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+ "dev": true
+ },
+ "magic-string": {
+ "version": "0.25.9",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+ "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+ "dev": true,
+ "requires": {
+ "sourcemap-codec": "^1.4.8"
+ }
+ }
+ }
+ },
+ "rollup-plugin-node-polyfills": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz",
+ "integrity": "sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==",
+ "dev": true,
+ "requires": {
+ "rollup-plugin-inject": "^3.0.0"
+ }
+ },
+ "rollup-pluginutils": {
+ "version": "2.8.2",
+ "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
+ "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
+ "dev": true,
+ "requires": {
+ "estree-walker": "^0.6.1"
+ },
+ "dependencies": {
+ "estree-walker": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+ "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+ "dev": true
+ }
+ }
+ },
+ "safe-stable-stringify": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
+ "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==",
+ "dev": true
+ },
+ "selfsigned": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+ "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
+ "dev": true,
+ "requires": {
+ "@types/node-forge": "^1.3.0",
+ "node-forge": "^1"
+ }
+ },
+ "shebang-command": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+ "dev": true,
+ "requires": {
+ "shebang-regex": "^3.0.0"
+ }
+ },
+ "shebang-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+ "dev": true
+ },
+ "siginfo": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+ "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+ "dev": true
+ },
+ "signal-exit": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+ "dev": true
+ },
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ },
+ "source-map-js": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+ "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+ "dev": true
+ },
+ "sourcemap-codec": {
+ "version": "1.4.8",
+ "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+ "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+ "dev": true
+ },
+ "stackback": {
+ "version": "0.0.2",
+ "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+ "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+ "dev": true
+ },
+ "stacktracey": {
+ "version": "2.1.8",
+ "resolved": "https://registry.npmjs.org/stacktracey/-/stacktracey-2.1.8.tgz",
+ "integrity": "sha512-Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw==",
+ "dev": true,
+ "requires": {
+ "as-table": "^1.0.36",
+ "get-source": "^2.0.12"
+ }
+ },
+ "std-env": {
+ "version": "3.7.0",
+ "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz",
+ "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
+ "dev": true
+ },
+ "stoppable": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz",
+ "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==",
+ "dev": true
+ },
+ "strip-final-newline": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+ "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+ "dev": true
+ },
+ "strip-literal": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.1.0.tgz",
+ "integrity": "sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==",
+ "dev": true,
+ "requires": {
+ "js-tokens": "^9.0.0"
+ }
+ },
+ "supports-preserve-symlinks-flag": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+ "dev": true
+ },
+ "tinybench": {
+ "version": "2.8.0",
+ "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.8.0.tgz",
+ "integrity": "sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==",
+ "dev": true
+ },
+ "tinypool": {
+ "version": "0.8.4",
+ "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.4.tgz",
+ "integrity": "sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==",
+ "dev": true
+ },
+ "tinyspy": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz",
+ "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==",
+ "dev": true
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
+ }
+ },
+ "ts-json-schema-generator": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/ts-json-schema-generator/-/ts-json-schema-generator-1.5.1.tgz",
+ "integrity": "sha512-apX5qG2+NA66j7b4AJm8q/DpdTeOsjfh7A3LpKsUiil0FepkNwtN28zYgjrsiiya2/OPhsr/PSjX5FUYg79rCg==",
+ "dev": true,
+ "requires": {
+ "@types/json-schema": "^7.0.15",
+ "commander": "^12.0.0",
+ "glob": "^8.0.3",
+ "json5": "^2.2.3",
+ "normalize-path": "^3.0.0",
+ "safe-stable-stringify": "^2.4.3",
+ "typescript": "~5.4.2"
+ }
+ },
+ "tslib": {
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+ "dev": true
+ },
+ "type-detect": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+ "dev": true
+ },
+ "typescript": {
+ "version": "5.4.5",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+ "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+ "dev": true
+ },
+ "ufo": {
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz",
+ "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==",
+ "dev": true
+ },
+ "undici": {
+ "version": "5.28.4",
+ "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
+ "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
+ "dev": true,
+ "requires": {
+ "@fastify/busboy": "^2.0.0"
+ }
+ },
+ "undici-types": {
+ "version": "5.26.5",
+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+ "dev": true
+ },
+ "vite": {
+ "version": "5.2.12",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz",
+ "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==",
+ "dev": true,
+ "requires": {
+ "esbuild": "^0.20.1",
+ "fsevents": "~2.3.3",
+ "postcss": "^8.4.38",
+ "rollup": "^4.13.0"
+ },
+ "dependencies": {
+ "@esbuild/android-arm": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+ "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/android-arm64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+ "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/android-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+ "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/darwin-arm64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
+ "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/darwin-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+ "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/freebsd-arm64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+ "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/freebsd-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+ "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-arm": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+ "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-arm64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+ "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-ia32": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+ "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-loong64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+ "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-mips64el": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+ "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-ppc64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+ "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-riscv64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+ "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-s390x": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+ "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/linux-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+ "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/netbsd-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+ "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/openbsd-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+ "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/sunos-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+ "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/win32-arm64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+ "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/win32-ia32": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+ "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@esbuild/win32-x64": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+ "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+ "dev": true,
+ "optional": true
+ },
+ "esbuild": {
+ "version": "0.20.2",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+ "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+ "dev": true,
+ "requires": {
+ "@esbuild/aix-ppc64": "0.20.2",
+ "@esbuild/android-arm": "0.20.2",
+ "@esbuild/android-arm64": "0.20.2",
+ "@esbuild/android-x64": "0.20.2",
+ "@esbuild/darwin-arm64": "0.20.2",
+ "@esbuild/darwin-x64": "0.20.2",
+ "@esbuild/freebsd-arm64": "0.20.2",
+ "@esbuild/freebsd-x64": "0.20.2",
+ "@esbuild/linux-arm": "0.20.2",
+ "@esbuild/linux-arm64": "0.20.2",
+ "@esbuild/linux-ia32": "0.20.2",
+ "@esbuild/linux-loong64": "0.20.2",
+ "@esbuild/linux-mips64el": "0.20.2",
+ "@esbuild/linux-ppc64": "0.20.2",
+ "@esbuild/linux-riscv64": "0.20.2",
+ "@esbuild/linux-s390x": "0.20.2",
+ "@esbuild/linux-x64": "0.20.2",
+ "@esbuild/netbsd-x64": "0.20.2",
+ "@esbuild/openbsd-x64": "0.20.2",
+ "@esbuild/sunos-x64": "0.20.2",
+ "@esbuild/win32-arm64": "0.20.2",
+ "@esbuild/win32-ia32": "0.20.2",
+ "@esbuild/win32-x64": "0.20.2"
+ }
+ }
+ }
+ },
+ "vite-node": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.3.0.tgz",
+ "integrity": "sha512-D/oiDVBw75XMnjAXne/4feCkCEwcbr2SU1bjAhCcfI5Bq3VoOHji8/wCPAfUkDIeohJ5nSZ39fNxM3dNZ6OBOA==",
+ "dev": true,
+ "requires": {
+ "cac": "^6.7.14",
+ "debug": "^4.3.4",
+ "pathe": "^1.1.1",
+ "picocolors": "^1.0.0",
+ "vite": "^5.0.0"
+ }
+ },
+ "vitest": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.3.0.tgz",
+ "integrity": "sha512-V9qb276J1jjSx9xb75T2VoYXdO1UKi+qfflY7V7w93jzX7oA/+RtYE6TcifxksxsZvygSSMwu2Uw6di7yqDMwg==",
+ "dev": true,
+ "requires": {
+ "@vitest/expect": "1.3.0",
+ "@vitest/runner": "1.3.0",
+ "@vitest/snapshot": "1.3.0",
+ "@vitest/spy": "1.3.0",
+ "@vitest/utils": "1.3.0",
+ "acorn-walk": "^8.3.2",
+ "chai": "^4.3.10",
+ "debug": "^4.3.4",
+ "execa": "^8.0.1",
+ "local-pkg": "^0.5.0",
+ "magic-string": "^0.30.5",
+ "pathe": "^1.1.1",
+ "picocolors": "^1.0.0",
+ "std-env": "^3.5.0",
+ "strip-literal": "^2.0.0",
+ "tinybench": "^2.5.1",
+ "tinypool": "^0.8.2",
+ "vite": "^5.0.0",
+ "vite-node": "1.3.0",
+ "why-is-node-running": "^2.2.2"
+ }
+ },
+ "which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "dev": true,
+ "requires": {
+ "isexe": "^2.0.0"
+ }
+ },
+ "why-is-node-running": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
+ "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
+ "dev": true,
+ "requires": {
+ "siginfo": "^2.0.0",
+ "stackback": "0.0.2"
+ }
+ },
+ "workerd": {
+ "version": "1.20240405.0",
+ "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20240405.0.tgz",
+ "integrity": "sha512-AWrOSBh4Ll7sBWHuh0aywm8hDkKqsZmcwnDB0PVGszWZM5mndNBI5iJ/8haXVpdoyqkJQEVdhET9JDi4yU8tRg==",
+ "dev": true,
+ "requires": {
+ "@cloudflare/workerd-darwin-64": "1.20240405.0",
+ "@cloudflare/workerd-darwin-arm64": "1.20240405.0",
+ "@cloudflare/workerd-linux-64": "1.20240405.0",
+ "@cloudflare/workerd-linux-arm64": "1.20240405.0",
+ "@cloudflare/workerd-windows-64": "1.20240405.0"
+ }
+ },
+ "wrangler": {
+ "version": "3.59.0",
+ "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-3.59.0.tgz",
+ "integrity": "sha512-MLKejazUJrekbD8EnQfN6d7fei+IGnq2aVXeILFDy0aTktVNXKvO+eC+mND1zOr+k0KvQN4sJo8vGwqYoY7btw==",
+ "dev": true,
+ "requires": {
+ "@cloudflare/kv-asset-handler": "0.3.2",
+ "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
+ "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
+ "blake3-wasm": "^2.1.5",
+ "chokidar": "^3.5.3",
+ "esbuild": "0.17.19",
+ "fsevents": "~2.3.2",
+ "miniflare": "3.20240524.2",
+ "nanoid": "^3.3.3",
+ "path-to-regexp": "^6.2.0",
+ "resolve": "^1.22.8",
+ "resolve.exports": "^2.0.2",
+ "selfsigned": "^2.0.1",
+ "source-map": "0.6.1",
+ "xxhash-wasm": "^1.0.1"
+ },
+ "dependencies": {
+ "@cloudflare/workerd-darwin-64": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20240524.0.tgz",
+ "integrity": "sha512-ATaXjefbTsrv4mpn4Fdua114RRDXcX5Ky+Mv+f4JTUllgalmqC4CYMN4jxRz9IpJU/fNMN8IEfvUyuJBAcl9Iw==",
+ "dev": true,
+ "optional": true
+ },
+ "@cloudflare/workerd-darwin-arm64": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20240524.0.tgz",
+ "integrity": "sha512-wnbsZI4CS0QPCd+wnBHQ40C28A/2Qo4ESi1YhE2735G3UNcc876MWksZhsubd+XH0XPIra6eNFqyw6wRMpQOXA==",
+ "dev": true,
+ "optional": true
+ },
+ "@cloudflare/workerd-linux-64": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20240524.0.tgz",
+ "integrity": "sha512-E8mj+HPBryKwaJAiNsYzXtVjKCL0KvUBZbtxJxlWM4mLSQhT+uwGT3nydb/hFY59rZnQgZslw0oqEWht5TEYiQ==",
+ "dev": true,
+ "optional": true
+ },
+ "@cloudflare/workerd-linux-arm64": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20240524.0.tgz",
+ "integrity": "sha512-/Fr1W671t2triNCDCBWdStxngnbUfZunZ/2e4kaMLzJDJLYDtYdmvOUCBDzUD4ssqmIMbn9RCQQ0U+CLEoqBqw==",
+ "dev": true,
+ "optional": true
+ },
+ "@cloudflare/workerd-windows-64": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20240524.0.tgz",
+ "integrity": "sha512-G+ThDEx57g9mAEKqhWnHaaJgpeGYtyhkmwM/BDpLqPks/rAY5YEfZbY4YL1pNk1kkcZDXGrwIsY8xe9Apf5JdA==",
+ "dev": true,
+ "optional": true
+ },
+ "miniflare": {
+ "version": "3.20240524.2",
+ "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-3.20240524.2.tgz",
+ "integrity": "sha512-Js+8cB61KJG0z2HuQTPLT9S6FwTBuMZfjtml3azUarLYsCF91N+PhIkvNpbkwCXcfRvscdjJ0RlT6lBQYEuIwA==",
+ "dev": true,
+ "requires": {
+ "@cspotcode/source-map-support": "0.8.1",
+ "acorn": "^8.8.0",
+ "acorn-walk": "^8.2.0",
+ "capnp-ts": "^0.7.0",
+ "exit-hook": "^2.2.1",
+ "glob-to-regexp": "^0.4.1",
+ "stoppable": "^1.1.0",
+ "undici": "^5.28.2",
+ "workerd": "1.20240524.0",
+ "ws": "^8.11.0",
+ "youch": "^3.2.2",
+ "zod": "^3.20.6"
+ }
+ },
+ "workerd": {
+ "version": "1.20240524.0",
+ "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20240524.0.tgz",
+ "integrity": "sha512-LWLe5D8PVHBcqturmBbwgI71r7YPpIMYZoVEH6S4G35EqIJ55cb0n3FipoSyraoIfpcCxCFxX1K6WsRHbP3pFA==",
+ "dev": true,
+ "requires": {
+ "@cloudflare/workerd-darwin-64": "1.20240524.0",
+ "@cloudflare/workerd-darwin-arm64": "1.20240524.0",
+ "@cloudflare/workerd-linux-64": "1.20240524.0",
+ "@cloudflare/workerd-linux-arm64": "1.20240524.0",
+ "@cloudflare/workerd-windows-64": "1.20240524.0"
+ }
+ }
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+ "dev": true
+ },
+ "ws": {
+ "version": "8.17.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
+ "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+ "dev": true,
+ "requires": {}
+ },
+ "xxhash-wasm": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-1.0.2.tgz",
+ "integrity": "sha512-ibF0Or+FivM9lNrg+HGJfVX8WJqgo+kCLDc4vx6xMeTce7Aj+DLttKbxxRR/gNLSAelRc1omAPlJ77N/Jem07A==",
+ "dev": true
+ },
+ "yocto-queue": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+ "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+ "dev": true
+ },
+ "youch": {
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/youch/-/youch-3.3.3.tgz",
+ "integrity": "sha512-qSFXUk3UZBLfggAW3dJKg0BMblG5biqSF8M34E06o5CSsZtH92u9Hqmj2RzGiHDi64fhe83+4tENFP2DB6t6ZA==",
+ "dev": true,
+ "requires": {
+ "cookie": "^0.5.0",
+ "mustache": "^4.2.0",
+ "stacktracey": "^2.1.8"
+ }
+ },
+ "zod": {
+ "version": "3.23.8",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz",
+ "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==",
+ "dev": true
+ }
+ }
+}
diff --git a/echo/cf-workers/ws/package.json b/echo/cf-workers/ws/package.json
new file mode 100644
index 0000000000..60a776acf2
--- /dev/null
+++ b/echo/cf-workers/ws/package.json
@@ -0,0 +1,19 @@
+{
+ "name": "ws",
+ "version": "0.0.0",
+ "private": true,
+ "scripts": {
+ "deploy": "wrangler deploy",
+ "dev": "wrangler dev",
+ "start": "wrangler dev",
+ "test": "vitest",
+ "cf-typegen": "wrangler types"
+ },
+ "devDependencies": {
+ "@cloudflare/vitest-pool-workers": "^0.1.0",
+ "@cloudflare/workers-types": "^4.20240603.0",
+ "typescript": "^5.0.4",
+ "vitest": "1.3.0",
+ "wrangler": "^3.0.0"
+ }
+}
diff --git a/echo/cf-workers/ws/src/index.ts b/echo/cf-workers/ws/src/index.ts
new file mode 100644
index 0000000000..6e217bd7fa
--- /dev/null
+++ b/echo/cf-workers/ws/src/index.ts
@@ -0,0 +1,92 @@
+/**
+ * Welcome to Cloudflare Workers! This is your first worker.
+ *
+ * - Run `npm run dev` in your terminal to start a development server
+ * - Open a browser tab at http://localhost:8787/ to see your worker in action
+ * - Run `npm run deploy` to publish your worker
+ *
+ * Bind resources to your worker in `wrangler.toml`. After adding bindings, a type definition for the
+ * `Env` object can be regenerated with `npm run cf-typegen`.
+ *
+ * Learn more at https://developers.cloudflare.com/workers/
+ */
+import { connect } from 'cloudflare:sockets';
+
+async function handleRequest(request) {
+ const upgradeHeader = request.headers.get('Upgrade');
+ if (!upgradeHeader || upgradeHeader !== 'websocket') {
+ return new Response('Expected Upgrade: websocket', { status: 426 });
+ }
+
+ const url = new URL(request.url);
+ const queryParams = url.searchParams;
+ const remoteAddr = queryParams.get('remote_addr');
+
+ const webSocketPair = new WebSocketPair();
+ const [client, server] = Object.values(webSocketPair);
+ server.accept();
+
+ const tcpSocket = connect(remoteAddr);
+
+ function closeAll() {
+ client.close();
+ server.close();
+ tcpSocket.close();
+ }
+
+ const readableStream = new ReadableStream({
+ start(controller) {
+ server.addEventListener('message', (event) => {
+ controller.enqueue(event.data);
+ });
+ server.addEventListener('close', () => {
+ controller.close();
+ closeAll();
+ });
+ server.addEventListener('error', (err) => {
+ controller.error(err);
+ closeAll();
+ });
+ },
+ });
+
+ const writableStream = new WritableStream({
+ write(chunk) {
+ server.send(chunk);
+ },
+ close() {
+ closeAll();
+ },
+ abort(err) {
+ console.error('Stream error:', err);
+ closeAll();
+ },
+ });
+
+ readableStream
+ .pipeTo(tcpSocket.writable)
+ .then(() => console.log('All data successfully written!'))
+ .catch((e) => {
+ console.error('Something went wrong on read!', e.message);
+ closeAll();
+ });
+
+ tcpSocket.readable
+ .pipeTo(writableStream)
+ .then(() => console.log('All data successfully written!'))
+ .catch((e) => {
+ console.error('Something went wrong on write!', e.message);
+ closeAll();
+ });
+
+ return new Response(null, {
+ status: 101,
+ webSocket: client,
+ });
+}
+
+export default {
+ async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise {
+ return handleRequest(request);
+ },
+};
diff --git a/echo/cf-workers/ws/tsconfig.json b/echo/cf-workers/ws/tsconfig.json
new file mode 100644
index 0000000000..91924903c2
--- /dev/null
+++ b/echo/cf-workers/ws/tsconfig.json
@@ -0,0 +1,104 @@
+{
+ "compilerOptions": {
+ /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+ /* Projects */
+ // "incremental": true, /* Enable incremental compilation */
+ // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
+ // "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */
+ // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */
+ // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
+ // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
+
+ /* Language and Environment */
+ "target": "es2021" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+ "lib": ["es2021"] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
+ "jsx": "react" /* Specify what JSX code is generated. */,
+ // "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
+ // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
+ // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
+ // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
+ // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */
+ // "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */
+ // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
+ // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
+
+ /* Modules */
+ "module": "es2022" /* Specify what module code is generated. */,
+ // "rootDir": "./", /* Specify the root folder within your source files. */
+ "moduleResolution": "Bundler" /* Specify how TypeScript looks up a file from a given module specifier. */,
+ // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
+ // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
+ // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
+ // "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */
+ "types": [
+ "@cloudflare/workers-types/2023-07-01"
+ ] /* Specify type package names to be included without being referenced in a source file. */,
+ // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
+ "resolveJsonModule": true /* Enable importing .json files */,
+ // "noResolve": true, /* Disallow `import`s, `require`s or ``s from expanding the number of files TypeScript should add to a project. */
+
+ /* JavaScript Support */
+ "allowJs": true /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */,
+ "checkJs": false /* Enable error reporting in type-checked JavaScript files. */,
+ // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
+
+ /* Emit */
+ // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
+ // "declarationMap": true, /* Create sourcemaps for d.ts files. */
+ // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
+ // "sourceMap": true, /* Create source map files for emitted JavaScript files. */
+ // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
+ // "outDir": "./", /* Specify an output folder for all emitted files. */
+ // "removeComments": true, /* Disable emitting comments. */
+ "noEmit": true /* Disable emitting files from a compilation. */,
+ // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
+ // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */
+ // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+ // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
+ // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
+ // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
+ // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
+ // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
+ // "newLine": "crlf", /* Set the newline character for emitting files. */
+ // "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */
+ // "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */
+ // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
+ // "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */
+ // "declarationDir": "./", /* Specify the output directory for generated declaration files. */
+ // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
+
+ /* Interop Constraints */
+ "isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
+ "allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
+ // "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
+ // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
+ "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
+
+ /* Type Checking */
+ "strict": true /* Enable all strict type-checking options. */,
+ // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */
+ // "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */
+ // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
+ // "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
+ // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
+ // "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */
+ // "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */
+ // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
+ // "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */
+ // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */
+ // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
+ // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
+ // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
+ // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
+ // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
+ // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */
+ // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
+ // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
+
+ /* Completeness */
+ // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
+ "skipLibCheck": true /* Skip type checking all .d.ts files. */
+ },
+ "exclude": ["test"]
+}
diff --git a/echo/cf-workers/ws/vitest.config.ts b/echo/cf-workers/ws/vitest.config.ts
new file mode 100644
index 0000000000..973627c268
--- /dev/null
+++ b/echo/cf-workers/ws/vitest.config.ts
@@ -0,0 +1,11 @@
+import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
+
+export default defineWorkersConfig({
+ test: {
+ poolOptions: {
+ workers: {
+ wrangler: { configPath: "./wrangler.toml" },
+ },
+ },
+ },
+});
diff --git a/echo/cf-workers/ws/worker-configuration.d.ts b/echo/cf-workers/ws/worker-configuration.d.ts
new file mode 100644
index 0000000000..5b2319b3f2
--- /dev/null
+++ b/echo/cf-workers/ws/worker-configuration.d.ts
@@ -0,0 +1,4 @@
+// Generated by Wrangler
+// After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
+interface Env {
+}
diff --git a/echo/cf-workers/ws/wrangler.toml b/echo/cf-workers/ws/wrangler.toml
new file mode 100644
index 0000000000..26f2da7fe0
--- /dev/null
+++ b/echo/cf-workers/ws/wrangler.toml
@@ -0,0 +1,108 @@
+#:schema node_modules/wrangler/config-schema.json
+name = "ws"
+main = "src/index.ts"
+compatibility_date = "2024-06-03"
+compatibility_flags = ["nodejs_compat"]
+
+# Automatically place your workloads in an optimal location to minimize latency.
+# If you are running back-end logic in a Worker, running it closer to your back-end infrastructure
+# rather than the end user may result in better performance.
+# Docs: https://developers.cloudflare.com/workers/configuration/smart-placement/#smart-placement
+# [placement]
+# mode = "smart"
+
+# Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
+# Docs:
+# - https://developers.cloudflare.com/workers/wrangler/configuration/#environment-variables
+# Note: Use secrets to store sensitive data.
+# - https://developers.cloudflare.com/workers/configuration/secrets/
+# [vars]
+# MY_VARIABLE = "production_value"
+
+# Bind the Workers AI model catalog. Run machine learning models, powered by serverless GPUs, on Cloudflare’s global network
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#workers-ai
+# [ai]
+# binding = "AI"
+
+# Bind an Analytics Engine dataset. Use Analytics Engine to write analytics within your Pages Function.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#analytics-engine-datasets
+# [[analytics_engine_datasets]]
+# binding = "MY_DATASET"
+
+# Bind a headless browser instance running on Cloudflare's global network.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#browser-rendering
+# [browser]
+# binding = "MY_BROWSER"
+
+# Bind a D1 database. D1 is Cloudflare’s native serverless SQL database.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#d1-databases
+# [[d1_databases]]
+# binding = "MY_DB"
+# database_name = "my-database"
+# database_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+
+# Bind a dispatch namespace. Use Workers for Platforms to deploy serverless functions programmatically on behalf of your customers.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#dispatch-namespace-bindings-workers-for-platforms
+# [[dispatch_namespaces]]
+# binding = "MY_DISPATCHER"
+# namespace = "my-namespace"
+
+# Bind a Durable Object. Durable objects are a scale-to-zero compute primitive based on the actor model.
+# Durable Objects can live for as long as needed. Use these when you need a long-running "server", such as in realtime apps.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#durable-objects
+# [[durable_objects.bindings]]
+# name = "MY_DURABLE_OBJECT"
+# class_name = "MyDurableObject"
+
+# Durable Object migrations.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#migrations
+# [[migrations]]
+# tag = "v1"
+# new_classes = ["MyDurableObject"]
+
+# Bind a Hyperdrive configuration. Use to accelerate access to your existing databases from Cloudflare Workers.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#hyperdrive
+# [[hyperdrive]]
+# binding = "MY_HYPERDRIVE"
+# id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+# Bind a KV Namespace. Use KV as persistent storage for small key-value pairs.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#kv-namespaces
+# [[kv_namespaces]]
+# binding = "MY_KV_NAMESPACE"
+# id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+# Bind an mTLS certificate. Use to present a client certificate when communicating with another service.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#mtls-certificates
+# [[mtls_certificates]]
+# binding = "MY_CERTIFICATE"
+# certificate_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+
+# Bind a Queue producer. Use this binding to schedule an arbitrary task that may be processed later by a Queue consumer.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#queues
+# [[queues.producers]]
+# binding = "MY_QUEUE"
+# queue = "my-queue"
+
+# Bind a Queue consumer. Queue Consumers can retrieve tasks scheduled by Producers to act on them.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#queues
+# [[queues.consumers]]
+# queue = "my-queue"
+
+# Bind an R2 Bucket. Use R2 to store arbitrarily large blobs of data, such as files.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#r2-buckets
+# [[r2_buckets]]
+# binding = "MY_BUCKET"
+# bucket_name = "my-bucket"
+
+# Bind another Worker service. Use this binding to call another Worker without network overhead.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#service-bindings
+# [[services]]
+# binding = "MY_SERVICE"
+# service = "my-service"
+
+# Bind a Vectorize index. Use to store and query vector embeddings for semantic search, classification and other vector search use-cases.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#vectorize-indexes
+# [[vectorize]]
+# binding = "MY_INDEX"
+# index_name = "my-index"
diff --git a/echo/examples/cf-ws.json b/echo/examples/cf-ws.json
new file mode 100644
index 0000000000..0294138d56
--- /dev/null
+++ b/echo/examples/cf-ws.json
@@ -0,0 +1,15 @@
+{
+ "web_port": 9000,
+ "relay_configs": [
+ {
+ "listen": "127.0.0.1:1235",
+ "listen_type": "raw",
+ "transport_type": "ws",
+ "tcp_remotes": ["ws://0.0.0.0:8787"],
+ "ws_config": {
+ "path": "pwd",
+ "remote_addr": "127.0.0.1:5201"
+ }
+ }
+ ]
+}
diff --git a/echo/examples/with_ping.json b/echo/examples/with_ping.json
index c1a111fc53..78c26e8b3f 100644
--- a/echo/examples/with_ping.json
+++ b/echo/examples/with_ping.json
@@ -2,6 +2,7 @@
"web_port": 9000,
"log_level": "info",
"enable_ping": true,
+ "relay_sync_interval": 6,
"relay_configs": [
{
"listen": "127.0.0.1:1234",
diff --git a/echo/examples/ws_config.json b/echo/examples/ws_config.json
new file mode 100644
index 0000000000..58172c0dcc
--- /dev/null
+++ b/echo/examples/ws_config.json
@@ -0,0 +1,24 @@
+{
+ "relay_configs": [
+ {
+ "listen": "127.0.0.1:1235",
+ "listen_type": "raw",
+ "transport_type": "ws",
+ "tcp_remotes": ["ws://0.0.0.0:2443"],
+ "ws_config": {
+ "path": "pwd",
+ "remote_addr": "127.0.0.1:5201"
+ }
+ },
+ {
+ "listen": "127.0.0.1:2443",
+ "listen_type": "ws",
+ "transport_type": "raw",
+ "tcp_remotes": ["0.0.0.0:5201"],
+ "ws_config": {
+ "path": "pwd",
+ "remote_addr": "127.0.0.1:5201"
+ }
+ }
+ ]
+}
diff --git a/echo/internal/cli/cmd.go b/echo/internal/cli/cmd.go
index d1f6bbb590..6e006e4e96 100644
--- a/echo/internal/cli/cmd.go
+++ b/echo/internal/cli/cmd.go
@@ -15,7 +15,7 @@ After=network.target
[Service]
LimitNOFILE=65535
-ExecStart=/root/ehco -c ""
+ExecStart=ehco -c ""
Restart=always
[Install]
diff --git a/echo/internal/cmgr/cmgr.go b/echo/internal/cmgr/cmgr.go
index 387c25d93b..560ac509aa 100644
--- a/echo/internal/cmgr/cmgr.go
+++ b/echo/internal/cmgr/cmgr.go
@@ -7,7 +7,7 @@ import (
"time"
"github.com/Ehco1996/ehco/internal/conn"
- "github.com/Ehco1996/ehco/pkg/node_metric"
+ "github.com/Ehco1996/ehco/pkg/metric_reader"
"go.uber.org/zap"
)
@@ -39,7 +39,7 @@ type cmgrImpl struct {
lock sync.RWMutex
cfg *Config
l *zap.SugaredLogger
- mr node_metric.Reader
+ mr metric_reader.Reader
// k: relay label, v: connection list
activeConnectionsMap map[string][]conn.RelayConn
@@ -54,7 +54,7 @@ func NewCmgr(cfg *Config) Cmgr {
closedConnectionsMap: make(map[string][]conn.RelayConn),
}
if cfg.NeedMetrics() {
- cmgr.mr = node_metric.NewReader(cfg.MetricsURL)
+ cmgr.mr = metric_reader.NewReader(cfg.MetricsURL)
}
return cmgr
}
diff --git a/echo/internal/cmgr/config.go b/echo/internal/cmgr/config.go
index 265ac807cd..12e475cf63 100644
--- a/echo/internal/cmgr/config.go
+++ b/echo/internal/cmgr/config.go
@@ -3,9 +3,9 @@ package cmgr
var DummyConfig = &Config{}
type Config struct {
- SyncURL string `json:"sync_url,omitempty"`
- MetricsURL string `json:"metrics_url,omitempty"`
- SyncInterval int `json:"sync_interval,omitempty"` // in seconds
+ SyncURL string
+ MetricsURL string
+ SyncInterval int // in seconds
}
func (c *Config) NeedSync() bool {
diff --git a/echo/internal/cmgr/metric_sync.go b/echo/internal/cmgr/metric_sync.go
index 63df84e4c3..267166e31c 100644
--- a/echo/internal/cmgr/metric_sync.go
+++ b/echo/internal/cmgr/metric_sync.go
@@ -7,7 +7,7 @@ import (
"github.com/Ehco1996/ehco/internal/conn"
"github.com/Ehco1996/ehco/internal/constant"
myhttp "github.com/Ehco1996/ehco/pkg/http"
- "github.com/Ehco1996/ehco/pkg/node_metric"
+ "github.com/Ehco1996/ehco/pkg/metric_reader"
"go.uber.org/zap"
)
@@ -26,9 +26,9 @@ type VersionInfo struct {
}
type syncReq struct {
- Version VersionInfo `json:"version"`
- Node node_metric.NodeMetrics `json:"node"`
- Stats []StatsPerRule `json:"stats"`
+ Version VersionInfo `json:"version"`
+ Node metric_reader.NodeMetrics `json:"node"`
+ Stats []StatsPerRule `json:"stats"`
}
func (cm *cmgrImpl) syncOnce(ctx context.Context) error {
diff --git a/echo/internal/relay/conf/cfg.go b/echo/internal/relay/conf/cfg.go
index a42aab3b65..eea710d1bb 100644
--- a/echo/internal/relay/conf/cfg.go
+++ b/echo/internal/relay/conf/cfg.go
@@ -3,6 +3,7 @@ package conf
import (
"errors"
"fmt"
+ "net/url"
"github.com/Ehco1996/ehco/internal/constant"
@@ -11,10 +12,17 @@ import (
)
const (
- ProtocolHTTP = "http"
- ProtocolTLS = "tls"
+ ProtocolHTTP = "http"
+ ProtocolTLS = "tls"
+ WS_HANDSHAKE_PATH = "handshake"
+ WS_QUERY_REMOTE_ADDR = "remote_addr"
)
+type WSConfig struct {
+ Path string `json:"path,omitempty"`
+ RemoteAddr string `json:"remote_addr,omitempty"`
+}
+
type Config struct {
Listen string `json:"listen"`
ListenType string `json:"listen_type"`
@@ -22,9 +30,28 @@ type Config struct {
TCPRemotes []string `json:"tcp_remotes"`
UDPRemotes []string `json:"udp_remotes"`
- Label string `json:"label,omitempty"`
- MaxConnection int `json:"max_connection,omitempty"`
- BlockedProtocols []string `json:"blocked_protocols,omitempty"`
+ Label string `json:"label,omitempty"`
+ MaxConnection int `json:"max_connection,omitempty"`
+ BlockedProtocols []string `json:"blocked_protocols,omitempty"`
+ WSConfig *WSConfig `json:"ws_config,omitempty"`
+}
+
+func (r *Config) GetWSHandShakePath() string {
+ if r.WSConfig != nil && r.WSConfig.Path != "" {
+ return r.WSConfig.Path
+ }
+ return WS_HANDSHAKE_PATH
+}
+
+func (r *Config) GetWSRemoteAddr(baseAddr string) (string, error) {
+ addr, err := url.JoinPath(baseAddr, r.GetWSHandShakePath())
+ if err != nil {
+ return "", err
+ }
+ if r.WSConfig != nil && r.WSConfig.RemoteAddr != "" {
+ addr += fmt.Sprintf("?%s=%s", WS_QUERY_REMOTE_ADDR, r.WSConfig.RemoteAddr)
+ }
+ return addr, nil
}
func (r *Config) Validate() error {
diff --git a/echo/internal/relay/relay.go b/echo/internal/relay/relay.go
index 0964b66eba..2e8829400a 100644
--- a/echo/internal/relay/relay.go
+++ b/echo/internal/relay/relay.go
@@ -19,12 +19,12 @@ func (r *Relay) UniqueID() string {
return r.cfg.Label
}
-func NewRelay(cfg *conf.Config, connMgr cmgr.Cmgr) (*Relay, error) {
- base := transporter.NewBaseTransporter(cfg, connMgr)
- s, err := transporter.NewRelayServer(cfg.ListenType, base)
+func NewRelay(cfg *conf.Config, cmgr cmgr.Cmgr) (*Relay, error) {
+ s, err := transporter.NewRelayServer(cfg, cmgr)
if err != nil {
return nil, err
}
+
r := &Relay{
relayServer: s,
cfg: cfg,
diff --git a/echo/internal/transporter/base.go b/echo/internal/transporter/base.go
index 6ebca196da..6f38630b81 100644
--- a/echo/internal/transporter/base.go
+++ b/echo/internal/transporter/base.go
@@ -19,10 +19,11 @@ import (
)
type baseTransporter struct {
+ cfg *conf.Config
+ l *zap.SugaredLogger
+
cmgr cmgr.Cmgr
- cfg *conf.Config
tCPRemotes lb.RoundRobin
- l *zap.SugaredLogger
}
func NewBaseTransporter(cfg *conf.Config, cmgr cmgr.Cmgr) *baseTransporter {
diff --git a/echo/internal/transporter/interface.go b/echo/internal/transporter/interface.go
index da40fe537c..360f896620 100644
--- a/echo/internal/transporter/interface.go
+++ b/echo/internal/transporter/interface.go
@@ -3,7 +3,9 @@ package transporter
import (
"net"
+ "github.com/Ehco1996/ehco/internal/cmgr"
"github.com/Ehco1996/ehco/internal/constant"
+ "github.com/Ehco1996/ehco/internal/relay/conf"
"github.com/Ehco1996/ehco/pkg/lb"
)
@@ -14,8 +16,8 @@ type RelayClient interface {
RelayTCPConn(c net.Conn, handshakeF TCPHandShakeF) error
}
-func NewRelayClient(relayType string, base *baseTransporter) (RelayClient, error) {
- switch relayType {
+func newRelayClient(base *baseTransporter) (RelayClient, error) {
+ switch base.cfg.TransportType {
case constant.RelayTypeRaw:
return newRawClient(base)
case constant.RelayTypeWS:
@@ -27,7 +29,7 @@ func NewRelayClient(relayType string, base *baseTransporter) (RelayClient, error
case constant.RelayTypeMTCP:
return newMtcpClient(base)
default:
- panic("unsupported transport type")
+ panic("unsupported transport type" + base.cfg.TransportType)
}
}
@@ -36,8 +38,9 @@ type RelayServer interface {
Close() error
}
-func NewRelayServer(relayType string, base *baseTransporter) (RelayServer, error) {
- switch relayType {
+func NewRelayServer(cfg *conf.Config, cmgr cmgr.Cmgr) (RelayServer, error) {
+ base := NewBaseTransporter(cfg, cmgr)
+ switch cfg.ListenType {
case constant.RelayTypeRaw:
return newRawServer(base)
case constant.RelayTypeWS:
@@ -49,6 +52,6 @@ func NewRelayServer(relayType string, base *baseTransporter) (RelayServer, error
case constant.RelayTypeMTCP:
return newMtcpServer(base)
default:
- panic("unsupported transport type")
+ panic("unsupported transport type" + cfg.ListenType)
}
}
diff --git a/echo/internal/transporter/raw.go b/echo/internal/transporter/raw.go
index c52df4651d..7f1b5940ad 100644
--- a/echo/internal/transporter/raw.go
+++ b/echo/internal/transporter/raw.go
@@ -57,7 +57,7 @@ func newRawServer(base *baseTransporter) (*RawServer, error) {
if err != nil {
return nil, err
}
- relayer, err := NewRelayClient(base.cfg.TransportType, base)
+ relayer, err := newRelayClient(base)
if err != nil {
return nil, err
}
@@ -80,6 +80,7 @@ func (s *RawServer) ListenAndServe() error {
return err
}
go func(c net.Conn) {
+ defer c.Close()
if err := s.RelayTCPConn(c, s.relayer.TCPHandShake); err != nil {
s.l.Errorf("RelayTCPConn error: %s", err.Error())
}
diff --git a/echo/internal/transporter/ws.go b/echo/internal/transporter/ws.go
index 37e4d6c313..a41eb45a6c 100644
--- a/echo/internal/transporter/ws.go
+++ b/echo/internal/transporter/ws.go
@@ -8,6 +8,7 @@ import (
"github.com/gobwas/ws"
"github.com/labstack/echo/v4"
+ "go.uber.org/zap"
"github.com/Ehco1996/ehco/internal/conn"
"github.com/Ehco1996/ehco/internal/constant"
@@ -37,7 +38,11 @@ func newWsClient(base *baseTransporter) (*WsClient, error) {
func (s *WsClient) TCPHandShake(remote *lb.Node) (net.Conn, error) {
t1 := time.Now()
- wsc, _, _, err := s.dialer.Dial(context.TODO(), remote.Address+"/handshake/")
+ addr, err := s.cfg.GetWSRemoteAddr(remote.Address)
+ if err != nil {
+ return nil, err
+ }
+ wsc, _, _, err := s.dialer.Dial(context.TODO(), addr)
if err != nil {
return nil, err
}
@@ -68,10 +73,13 @@ func newWsServer(base *baseTransporter) (*WsServer, error) {
},
}
e := web.NewEchoServer()
+ e.Use(web.NginxLogMiddleware(zap.S().Named("ws-server")))
+
e.GET("/", echo.WrapHandler(web.MakeIndexF()))
- e.GET("/handshake/", echo.WrapHandler(http.HandlerFunc(s.HandleRequest)))
+ e.GET(base.cfg.GetWSHandShakePath(), echo.WrapHandler(http.HandlerFunc(s.HandleRequest)))
+
s.e = e
- relayer, err := NewRelayClient(base.cfg.TransportType, base)
+ relayer, err := newRelayClient(base)
if err != nil {
return nil, err
}
diff --git a/echo/internal/transporter/wss_mux.go b/echo/internal/transporter/wss_mux.go
index e7af0f9f2e..95b10986d6 100644
--- a/echo/internal/transporter/wss_mux.go
+++ b/echo/internal/transporter/wss_mux.go
@@ -57,7 +57,11 @@ func (c *MwssClient) initNewSession(ctx context.Context, addr string) (*smux.Ses
func (s *MwssClient) TCPHandShake(remote *lb.Node) (net.Conn, error) {
t1 := time.Now()
- mwssc, err := s.muxTP.Dial(context.TODO(), remote.Address+"/handshake/")
+ addr, err := s.cfg.GetWSRemoteAddr(remote.Address)
+ if err != nil {
+ return nil, err
+ }
+ mwssc, err := s.muxTP.Dial(context.TODO(), addr)
if err != nil {
return nil, err
}
@@ -81,7 +85,7 @@ func newMwssServer(base *baseTransporter) (*MwssServer, error) {
WssServer: wssServer,
muxServerImpl: newMuxServer(base.cfg.Listen, base.l.Named("mwss")),
}
- s.e.GET("/handshake/", echo.WrapHandler(http.HandlerFunc(s.HandleRequest)))
+ s.e.GET(base.cfg.GetWSHandShakePath(), echo.WrapHandler(http.HandlerFunc(s.HandleRequest)))
return s, nil
}
diff --git a/echo/pkg/node_metric/reader.go b/echo/pkg/metric_reader/reader.go
similarity index 88%
rename from echo/pkg/node_metric/reader.go
rename to echo/pkg/metric_reader/reader.go
index 22cdfac5fd..d6e227da96 100644
--- a/echo/pkg/node_metric/reader.go
+++ b/echo/pkg/metric_reader/reader.go
@@ -1,4 +1,4 @@
-package node_metric
+package metric_reader
import (
"context"
@@ -10,6 +10,7 @@ import (
dto "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
+ "go.uber.org/zap"
)
type Reader interface {
@@ -30,6 +31,27 @@ func NewReader(metricsURL string) *readerImpl {
}
}
+func (b *readerImpl) parsePingInfo(metricMap map[string]*dto.MetricFamily, nm *NodeMetrics) error {
+ metric, ok := metricMap["ehco_ping_response_duration_seconds"]
+ if !ok {
+ // this metric is optional when enable_ping = false
+ zap.S().Warn("ping metric not found")
+ return nil
+ }
+ for _, m := range metric.Metric {
+ g := m.GetHistogram()
+ ip := ""
+ val := float64(g.GetSampleSum()) / float64(g.GetSampleCount()) * 1000 // to ms
+ for _, label := range m.GetLabel() {
+ if label.GetName() == "ip" {
+ ip = label.GetValue()
+ }
+ }
+ nm.PingMetrics = append(nm.PingMetrics, PingMetric{Latency: val, Target: ip})
+ }
+ return nil
+}
+
func (b *readerImpl) parseCpuInfo(metricMap map[string]*dto.MetricFamily, nm *NodeMetrics) error {
handleMetric := func(metricName string, handleValue func(float64, string)) error {
metric, ok := metricMap[metricName]
@@ -250,8 +272,7 @@ func (b *readerImpl) ReadOnce(ctx context.Context) (*NodeMetrics, error) {
if err != nil {
return nil, err
}
-
- nm := &NodeMetrics{syncTime: time.Now()}
+ nm := &NodeMetrics{syncTime: time.Now(), PingMetrics: []PingMetric{}}
if err := b.parseCpuInfo(parsed, nm); err != nil {
return nil, err
}
@@ -264,6 +285,10 @@ func (b *readerImpl) ReadOnce(ctx context.Context) (*NodeMetrics, error) {
if err := b.parseNetworkInfo(parsed, nm); err != nil {
return nil, err
}
+ if err := b.parsePingInfo(parsed, nm); err != nil {
+ return nil, err
+ }
+
b.lastMetrics = nm
return nm, nil
}
diff --git a/echo/pkg/node_metric/types.go b/echo/pkg/metric_reader/types.go
similarity index 80%
rename from echo/pkg/node_metric/types.go
rename to echo/pkg/metric_reader/types.go
index 0846d79904..3f691511d6 100644
--- a/echo/pkg/node_metric/types.go
+++ b/echo/pkg/metric_reader/types.go
@@ -1,6 +1,8 @@
-package node_metric
+package metric_reader
-import "time"
+import (
+ "time"
+)
type NodeMetrics struct {
// cpu
@@ -24,5 +26,13 @@ type NodeMetrics struct {
NetworkReceiveBytesRate float64 `json:"network_receive_bytes_rate"`
NetworkTransmitBytesRate float64 `json:"network_transmit_bytes_rate"`
+ // ping
+ PingMetrics []PingMetric `json:"ping_metrics"`
+
syncTime time.Time
}
+
+type PingMetric struct {
+ Latency float64 `json:"latency"` // in ms
+ Target string `json:"target"`
+}
diff --git a/echo/pkg/node_metric/utils.go b/echo/pkg/metric_reader/utils.go
similarity index 95%
rename from echo/pkg/node_metric/utils.go
rename to echo/pkg/metric_reader/utils.go
index 419a65c700..9749148197 100644
--- a/echo/pkg/node_metric/utils.go
+++ b/echo/pkg/metric_reader/utils.go
@@ -1,4 +1,4 @@
-package node_metric
+package metric_reader
import "regexp"
diff --git a/geoip/go.mod b/geoip/go.mod
index d5e00457ea..abc4773f66 100644
--- a/geoip/go.mod
+++ b/geoip/go.mod
@@ -2,29 +2,29 @@ module github.com/Loyalsoldier/geoip
go 1.21
-toolchain go1.21.7
+toolchain go1.21.10
require (
github.com/maxmind/mmdbwriter v1.0.0
- github.com/oschwald/maxminddb-golang v1.12.0
- github.com/v2fly/v2ray-core/v5 v5.14.1
+ github.com/oschwald/maxminddb-golang v1.13.0
+ github.com/v2fly/v2ray-core/v5 v5.16.1
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
- google.golang.org/protobuf v1.33.0
+ google.golang.org/protobuf v1.34.1
gopkg.in/yaml.v2 v2.4.0
)
require (
github.com/adrg/xdg v0.4.0 // indirect
- github.com/golang/protobuf v1.5.3 // indirect
+ github.com/golang/protobuf v1.5.4 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pires/go-proxyproto v0.7.0 // indirect
- github.com/quic-go/quic-go v0.41.0 // indirect
+ github.com/quic-go/quic-go v0.43.0 // indirect
go.starlark.net v0.0.0-20230612165344-9532f5667272 // indirect
- golang.org/x/crypto v0.17.0 // indirect
- golang.org/x/net v0.19.0 // indirect
- golang.org/x/sys v0.15.0 // indirect
+ golang.org/x/crypto v0.22.0 // indirect
+ golang.org/x/net v0.24.0 // indirect
+ golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.14.0 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/geoip/go.sum b/geoip/go.sum
index a78115ab08..db17cada9a 100644
--- a/geoip/go.sum
+++ b/geoip/go.sum
@@ -6,12 +6,12 @@ github.com/aead/cmac v0.0.0-20160719120800-7af84192f0b1 h1:+JkXLHME8vLJafGhOH4ao
github.com/aead/cmac v0.0.0-20160719120800-7af84192f0b1/go.mod h1:nuudZmJhzWtx2212z+pkuy7B6nkBqa+xwNXZHL1j8cg=
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
-github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
-github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
+github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/boljen/go-bitmap v0.0.0-20151001105940-23cd2fb0ce7d h1:zsO4lp+bjv5XvPTF58Vq+qgmZEYZttJK+CWtSZhKenI=
github.com/boljen/go-bitmap v0.0.0-20151001105940-23cd2fb0ce7d/go.mod h1:f1iKL6ZhUWvbk7PdWVmOaak10o86cqMUYEmn1CZNGEI=
-github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY=
-github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE=
+github.com/bufbuild/protocompile v0.10.0 h1:+jW/wnLMLxaCEG8AX9lD0bQ5v9h1RUiMKOBOT5ll9dM=
+github.com/bufbuild/protocompile v0.10.0/go.mod h1:G9qQIQo0xZ6Uyj6CMNz0saGmx2so+KONo8/KrELABiY=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
@@ -29,12 +29,10 @@ github.com/ebfe/bcrypt_pbkdf v0.0.0-20140212075826-3c8d2dcb253a h1:YtdtTUN1iH97s
github.com/ebfe/bcrypt_pbkdf v0.0.0-20140212075826-3c8d2dcb253a/go.mod h1:/CZpbhAusDOobpcb9yubw46kdYjq0zRC0Wpg9a9zFQM=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
-github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
-github.com/gaukas/godicttls v0.0.4 h1:NlRaXb3J6hAnTmWdsEKb9bcSBD6BvcIjdGdeb0zfXbk=
-github.com/gaukas/godicttls v0.0.4/go.mod h1:l6EenT4TLWgTdwslVb4sEMOCf7Bv0JAK67deKr9/NCI=
-github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
-github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
+github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
+github.com/go-chi/chi/v5 v5.0.12 h1:9euLV5sTrTNTRUU9POmDUvfxyj6LAABLUcEWO+JJb4s=
+github.com/go-chi/chi/v5 v5.0.12/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
@@ -43,8 +41,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqRRkz6M78GuJAfGE=
-github.com/go-playground/validator/v10 v10.16.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
+github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -59,9 +57,8 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -70,7 +67,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
@@ -79,10 +75,10 @@ github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9S
github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
-github.com/jhump/protoreflect v1.15.3 h1:6SFRuqU45u9hIZPJAoZ8c28T3nK64BNdp9w6jFonzls=
-github.com/jhump/protoreflect v1.15.3/go.mod h1:4ORHmSBmlCW8fh3xHmJMGyul1zNqZK4Elxc8qKP+p1k=
-github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
-github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/jhump/protoreflect v1.16.0 h1:54fZg+49widqXYQ0b+usAFHbMkBGR4PpXrsHc8+TBDg=
+github.com/jhump/protoreflect v1.16.0/go.mod h1:oYPd7nPvcBw/5wlDfm/AVmU9zH9BgqGCI469pGxfj/8=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
github.com/klauspost/reedsolomon v1.11.7 h1:9uaHU0slncktTEEg4+7Vl7q7XUNMBUOK4R9gnKhMjAU=
@@ -91,8 +87,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
-github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
+github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
+github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
github.com/maxmind/mmdbwriter v1.0.0 h1:bieL4P6yaYaHvbtLSwnKtEvScUKKD6jcKaLiTM3WSMw=
@@ -105,8 +101,8 @@ github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs
github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE=
github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
-github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
-github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
+github.com/oschwald/maxminddb-golang v1.13.0 h1:R8xBorY71s84yO06NgTmQvqvTvlS/bnYZrrWX1MElnU=
+github.com/oschwald/maxminddb-golang v1.13.0/go.mod h1:BU0z8BfFVhi1LQaonTwwGQlsHUEu9pWNdMfmq4ztm0o=
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
@@ -119,18 +115,18 @@ github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
github.com/pion/sctp v1.8.7 h1:JnABvFakZueGAn4KU/4PSKg+GWbF6QWbKTWZOSGJjXw=
github.com/pion/sctp v1.8.7/go.mod h1:g1Ul+ARqZq5JEmoFy87Q/4CePtKnTJ1QCL9dBBdN6AU=
-github.com/pion/transport/v2 v2.2.4 h1:41JJK6DZQYSeVLxILA2+F4ZkKb4Xd/tFJZRFZQ9QAlo=
-github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0=
+github.com/pion/transport/v2 v2.2.5 h1:iyi25i/21gQck4hfRhomF6SktmUQjRsRW4WJdhfc3Kc=
+github.com/pion/transport/v2 v2.2.5/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0=
github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/quic-go/quic-go v0.41.0 h1:aD8MmHfgqTURWNJy48IYFg2OnxwHT3JL7ahGs73lb4k=
-github.com/quic-go/quic-go v0.41.0/go.mod h1:qCkNjqczPEvgsOnxZ0eCD14lv+B2LHlFAB++CNOh9hA=
-github.com/refraction-networking/utls v1.5.4 h1:9k6EO2b8TaOGsQ7Pl7p9w6PUhx18/ZCeT0WNTZ7Uw4o=
-github.com/refraction-networking/utls v1.5.4/go.mod h1:SPuDbBmgLGp8s+HLNc83FuavwZCFoMmExj+ltUHiHUw=
+github.com/quic-go/quic-go v0.43.0 h1:sjtsTKWX0dsHpuMJvLxGqoQdtgJnbAPWY+W+5vjYW/g=
+github.com/quic-go/quic-go v0.43.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
+github.com/refraction-networking/utls v1.6.5 h1:Jlfqgs/t1Uy6FHHQ8Fz9ZTrRmP/zS7d/NZw7BLahaL8=
+github.com/refraction-networking/utls v1.6.5/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5DDhzJfkV1tdqtawQIH0=
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
@@ -141,16 +137,16 @@ github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIO
github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb/go.mod h1:bR6DqgcAl1zTcOX8/pE2Qkj9XO00eCNqmKb7lXP8EAg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/v2fly/BrowserBridge v0.0.0-20210430233438-0570fc1d7d08 h1:4Yh46CVE3k/lPq6hUbEdbB1u1anRBXLewm3k+L0iOMc=
github.com/v2fly/BrowserBridge v0.0.0-20210430233438-0570fc1d7d08/go.mod h1:KAuQNm+LWQCOFqdBcUgihPzRpVXRKzGbTNhfEfRZ4wY=
github.com/v2fly/VSign v0.0.0-20201108000810-e2adc24bf848 h1:p1UzXK6VAutXFFQMnre66h7g1BjRKUnLv0HfmmRoz7w=
github.com/v2fly/VSign v0.0.0-20201108000810-e2adc24bf848/go.mod h1:p80Bv154ZtrGpXMN15slDCqc9UGmfBuUzheDFBYaW/M=
github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e h1:5QefA066A1tF8gHIiADmOVOV5LS43gt3ONnlEl3xkwI=
github.com/v2fly/ss-bloomring v0.0.0-20210312155135-28617310f63e/go.mod h1:5t19P9LBIrNamL6AcMQOncg/r10y3Pc01AbHeMhwlpU=
-github.com/v2fly/v2ray-core/v5 v5.14.1 h1:b+NPseG+3cvLMMccgX7zFdCye/NstVABGOyuhG4XLDg=
-github.com/v2fly/v2ray-core/v5 v5.14.1/go.mod h1:Z57o2Vp+xgrf7EDFMDlZsickQuImRdQoDcqrO690zT0=
+github.com/v2fly/v2ray-core/v5 v5.16.1 h1:hIuRzCJhmRYqCA76hGiNLkAHopgbNt91L871wlJ/yUU=
+github.com/v2fly/v2ray-core/v5 v5.16.1/go.mod h1:3pWIBTmNagMKpzd9/QicXq/7JZCQt716GsGZdBNmYkU=
github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI=
github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
github.com/xiaokangwang/VLite v0.0.0-20220418190619-cff95160a432 h1:I/ATawgO2RerCq9ACwL0wBB8xNXZdE3J+93MCEHReRs=
@@ -159,52 +155,52 @@ github.com/xtaci/smux v1.5.24 h1:77emW9dtnOxxOQ5ltR+8BbsX1kzcOxQ5gB+aaV9hXOY=
github.com/xtaci/smux v1.5.24/go.mod h1:OMlQbT5vcgl2gb49mFkYo6SMf+zP3rcjcwQz7ZU7IGY=
go.starlark.net v0.0.0-20230612165344-9532f5667272 h1:2/wtqS591wZyD2OsClsVBKRPEvBsQt/Js+fsCiYhwu8=
go.starlark.net v0.0.0-20230612165344-9532f5667272/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds=
-go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo=
-go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090 h1:Di6/M8l0O2lCLc6VVRWhgCiApHV8MnQurBnFSHsQtNY=
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
+golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
+golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
-golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
+golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
@@ -212,13 +208,13 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
-google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
+google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
+google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -227,10 +223,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
+google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -243,5 +237,5 @@ gvisor.dev/gvisor v0.0.0-20231020174304-b8a429915ff1 h1:qDCwdCWECGnwQSQC01Dpnp09
gvisor.dev/gvisor v0.0.0-20231020174304-b8a429915ff1/go.mod h1:8hmigyCdYtw5xJGfQDJzSH5Ju8XEIDBnpyi8+O6GRt8=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI=
-lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
+lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
+lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
diff --git a/lede/package/libs/elfutils/Makefile b/lede/package/libs/elfutils/Makefile
index d4e5d994e8..94b01d73b2 100644
--- a/lede/package/libs/elfutils/Makefile
+++ b/lede/package/libs/elfutils/Makefile
@@ -83,6 +83,11 @@ CONFIGURE_VARS += \
TARGET_CFLAGS += -D_GNU_SOURCE -Wno-unused-result -Wno-format-nonliteral
+ifneq ($(filter $(GCC_MAJOR_VERSION),12 13),)
+TARGET_CFLAGS += \
+ -Wno-error=use-after-free
+endif
+
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
diff --git a/lede/package/libs/gettext-full/Makefile b/lede/package/libs/gettext-full/Makefile
index 2319401baf..55164644ed 100644
--- a/lede/package/libs/gettext-full/Makefile
+++ b/lede/package/libs/gettext-full/Makefile
@@ -64,6 +64,7 @@ HOST_CONFIGURE_ARGS += \
--disable-rpath \
--disable-java \
--disable-openmp \
+ --disable-curses \
--without-emacs \
--without-libxml2-prefix
diff --git a/lede/package/libs/gettext-full/patches/020-fix_clang.patch b/lede/package/libs/gettext-full/patches/020-fix_clang.patch
new file mode 100644
index 0000000000..284b5ab9fa
--- /dev/null
+++ b/lede/package/libs/gettext-full/patches/020-fix_clang.patch
@@ -0,0 +1,11 @@
+--- a/libtextstyle/lib/iconv-ostream.c
++++ b/libtextstyle/lib/iconv-ostream.c
+@@ -231,7 +231,7 @@ iconv_ostream__write_mem (iconv_ostream_t stream, const void *data, size_t len)
+ }
+
+ static void
+-iconv_ostream__flush (iconv_ostream_t stream)
++iconv_ostream__flush (iconv_ostream_t stream, ostream_flush_scope_t scope)
+ {
+ abort ();
+ }
diff --git a/lede/package/libs/libjson-c/Makefile b/lede/package/libs/libjson-c/Makefile
index 2c312f200e..063cf26442 100644
--- a/lede/package/libs/libjson-c/Makefile
+++ b/lede/package/libs/libjson-c/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=json-c
-PKG_VERSION:=0.16
-PKG_RELEASE:=2
+PKG_VERSION:=0.17
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz
PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
-PKG_HASH:=ac8a3dd6820daaca579b23fbc74664310fbc3d67f52f6707cda67d21dde5570f
+PKG_HASH:=8df3b66597333dd365762cab2de2ff68e41e3808a04b692e696e0550648eefaa
PKG_MAINTAINER:=Felix Fietkau
PKG_LICENSE:=MIT
diff --git a/lede/package/libs/libjson-c/patches/001-dont-build-docs.patch b/lede/package/libs/libjson-c/patches/001-dont-build-docs.patch
index f35da80724..1de420f8b8 100644
--- a/lede/package/libs/libjson-c/patches/001-dont-build-docs.patch
+++ b/lede/package/libs/libjson-c/patches/001-dont-build-docs.patch
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -433,8 +433,6 @@ configure_file(json.h.cmakein ${PROJECT_
+@@ -451,8 +451,6 @@ configure_file(json.h.cmakein ${PROJECT_
include_directories(${PROJECT_SOURCE_DIR})
include_directories(${PROJECT_BINARY_DIR})
diff --git a/lede/target/linux/ramips/dts/mt7621_leigod_a7000.dts b/lede/target/linux/ramips/dts/mt7621_leigod_a7000.dts
index 292d22f714..a7b08d527f 100644
--- a/lede/target/linux/ramips/dts/mt7621_leigod_a7000.dts
+++ b/lede/target/linux/ramips/dts/mt7621_leigod_a7000.dts
@@ -88,10 +88,10 @@
reg = <0x50000 0x1e00000>;
};
- partition@1f00000 {
- label = "sysinfo";
- reg = <0x1f00000 0x10000>;
- };
+ partition@1f00000 {
+ label = "sysinfo";
+ reg = <0x1f00000 0x10000>;
+ };
};
};
};
@@ -137,7 +137,7 @@
&state_default {
gpio {
- groups = "jtag", "wdt";
+ groups = "jtag", "uart3", "wdt";
function = "gpio";
};
};
diff --git a/lede/target/linux/ramips/dts/mt7621_openfi_5pro.dts b/lede/target/linux/ramips/dts/mt7621_openfi_5pro.dts
old mode 100755
new mode 100644
index 7560d405bd..1ef292a780
--- a/lede/target/linux/ramips/dts/mt7621_openfi_5pro.dts
+++ b/lede/target/linux/ramips/dts/mt7621_openfi_5pro.dts
@@ -118,7 +118,7 @@
};
&pcie1 {
- wifi1: mt76@0,0 {
+ mt76@0,0 {
compatible = "mediatek,mt76";
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x8000>;
@@ -147,7 +147,7 @@
&state_default {
gpio {
- groups = "wdt", "i2c", "jtag";
+ groups = "wdt", "jtag";
function = "gpio";
};
};
diff --git a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-fastrhino.dtsi b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-fastrhino.dtsi
index 186fc67615..4588af44d9 100644
--- a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-fastrhino.dtsi
+++ b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-fastrhino.dtsi
@@ -46,16 +46,6 @@
vin-supply = <&vcc12v_dcin>;
};
- vcc5v0_usb: vcc5v0-usb {
- compatible = "regulator-fixed";
- regulator-always-on;
- regulator-boot-on;
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
- regulator-name = "vcc5v0_usb";
- vin-supply = <&vcc12v_dcin>;
- };
-
vcc5v0_usb_otg: vcc5v0-usb-otg {
compatible = "regulator-fixed";
enable-active-high;
@@ -65,7 +55,7 @@
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-name = "vcc5v0_usb_otg";
- vin-supply = <&vcc5v0_usb>;
+ vin-supply = <&vcc5v0_sys>;
};
vcc3v3_pcie: vcc3v3-pcie {
@@ -75,10 +65,10 @@
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-name = "vcc3v3_pcie";
- vin-supply = <&vcc12v_dcin>;
+ vin-supply = <&vcc5v0_sys>;
};
- gpio-keys {
+ keys {
compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&reset_button_pin>;
@@ -112,10 +102,6 @@
status = "okay";
};
-&combphy2 {
- status = "okay";
-};
-
&cpu0 {
cpu-supply = <&vdd_cpu>;
};
@@ -132,7 +118,6 @@
cpu-supply = <&vdd_cpu>;
};
-#ifdef DTS_NO_LEGACY
&display_subsystem {
status = "disabled";
};
@@ -141,7 +126,6 @@
mali-supply = <&vdd_gpu>;
status = "okay";
};
-#endif
&i2c0 {
status = "okay";
@@ -459,8 +443,8 @@
&pmu_io_domains {
pmuio1-supply = <&vcc3v3_pmu>;
pmuio2-supply = <&vcc3v3_pmu>;
- vccio1-supply = <&vccio_acodec>;
- vccio3-supply = <&vccio_sd>;
+ vccio1-supply = <&vcc_3v3>;
+ vccio3-supply = <&vcc_3v3>;
vccio4-supply = <&vcc_1v8>;
vccio5-supply = <&vcc_3v3>;
vccio6-supply = <&vcc_1v8>;
@@ -501,6 +485,7 @@
};
&usb2phy0_host {
+ phy-supply = <&vcc5v0_sys>;
status = "okay";
};
@@ -509,7 +494,6 @@
status = "okay";
};
-#ifdef DTS_NO_LEGACY
&vop {
assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
@@ -519,4 +503,3 @@
&vop_mmu {
status = "okay";
};
-#endif
diff --git a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-hinlink-opc.dtsi b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-hinlink-opc.dtsi
index d7b4219971..77c336a8f4 100644
--- a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-hinlink-opc.dtsi
+++ b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-hinlink-opc.dtsi
@@ -22,7 +22,6 @@
stdout-path = "serial2:1500000n8";
};
-#ifdef DTS_NO_LEGACY
hdmi-con {
compatible = "hdmi-connector";
type = "a";
@@ -33,7 +32,6 @@
};
};
};
-#endif
keys {
compatible = "gpio-keys";
@@ -180,7 +178,6 @@
cpu-supply = <&vdd_cpu>;
};
-#ifdef DTS_NO_LEGACY
&gpu {
mali-supply = <&vdd_gpu>;
status = "okay";
@@ -207,7 +204,6 @@
&hdmi_sound {
status = "okay";
};
-#endif
&i2c0 {
status = "okay";
@@ -451,11 +447,9 @@
status = "okay";
};
-#ifdef DTS_NO_LEGACY
&i2s0_8ch {
status = "okay";
};
-#endif
&i2s1_8ch {
rockchip,trcm-sync-tx-only;
@@ -589,7 +583,7 @@
disable-wp;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>;
- sd-uhs-sdr104;
+ sd-uhs-sdr50;
vmmc-supply = <&vcc3v3_sd>;
vqmmc-supply = <&vccio_sd>;
status = "okay";
@@ -648,7 +642,6 @@
status = "okay";
};
-#ifdef DTS_NO_LEGACY
&vop {
assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
@@ -665,4 +658,3 @@
remote-endpoint = <&hdmi_in_vp0>;
};
};
-#endif
diff --git a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
index 1541e747b1..c5bb0080c2 100644
--- a/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+++ b/lede/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -8,7 +8,7 @@
#include "rk3568.dtsi"
/ {
- model = "Radxa ROCK3 Model A";
+ model = "Radxa ROCK 3A";
compatible = "radxa,rock3a", "rockchip,rk3568";
aliases {
@@ -21,7 +21,6 @@
stdout-path = "serial2:1500000n8";
};
-#ifdef DTS_NO_LEGACY
hdmi-con {
compatible = "hdmi-connector";
type = "a";
@@ -32,7 +31,6 @@
};
};
};
-#endif
leds {
compatible = "gpio-leds";
@@ -62,14 +60,14 @@
};
};
- vcc12v_dcin: vcc12v-dcin {
+ vcc12v_dcin: vcc12v-dcin-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc12v_dcin";
regulator-always-on;
regulator-boot-on;
};
- vcc3v3_sys: vcc3v3-sys {
+ vcc3v3_sys: vcc3v3-sys-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc3v3_sys";
regulator-always-on;
@@ -79,7 +77,7 @@
vin-supply = <&vcc12v_dcin>;
};
- vcc5v0_sys: vcc5v0-sys {
+ vcc5v0_sys: vcc5v0-sys-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys";
regulator-always-on;
@@ -89,7 +87,7 @@
vin-supply = <&vcc12v_dcin>;
};
- vcc5v0_usb: vcc5v0-usb {
+ vcc5v0_usb: vcc5v0-usb-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_usb";
regulator-always-on;
@@ -99,7 +97,7 @@
vin-supply = <&vcc12v_dcin>;
};
- vcc5v0_usb_host: vcc5v0-usb-host {
+ vcc5v0_usb_host: vcc5v0-usb-host-regulator {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>;
@@ -111,7 +109,7 @@
vin-supply = <&vcc5v0_usb>;
};
- vcc5v0_usb_hub: vcc5v0-usb-hub {
+ vcc5v0_usb_hub: vcc5v0-usb-hub-regulator {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
@@ -122,7 +120,7 @@
vin-supply = <&vcc5v0_usb>;
};
- vcc5v0_usb_otg: vcc5v0-usb-otg {
+ vcc5v0_usb_otg: vcc5v0-usb-otg-regulator {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
@@ -134,7 +132,7 @@
vin-supply = <&vcc5v0_usb>;
};
- pcie30_avdd0v9: pcie30-avdd0v9 {
+ pcie30_avdd0v9: pcie30-avdd0v9-regulator {
compatible = "regulator-fixed";
regulator-name = "pcie30_avdd0v9";
regulator-always-on;
@@ -144,7 +142,7 @@
vin-supply = <&vcc3v3_sys>;
};
- pcie30_avdd1v8: pcie30-avdd1v8 {
+ pcie30_avdd1v8: pcie30-avdd1v8-regulator {
compatible = "regulator-fixed";
regulator-name = "pcie30_avdd1v8";
regulator-always-on;
@@ -155,7 +153,7 @@
};
/* pi6c pcie clock generator */
- vcc3v3_pi6c_03: vcc3v3-pi6c-03 {
+ vcc3v3_pi6c_03: vcc3v3-pi6c-03-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc3v3_pi6c_03";
regulator-always-on;
@@ -165,7 +163,7 @@
vin-supply = <&vcc5v0_sys>;
};
- vcc3v3_pcie: vcc3v3-pcie {
+ vcc3v3_pcie: vcc3v3-pcie-regulator {
compatible = "regulator-fixed";
enable-active-high;
gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
@@ -177,7 +175,7 @@
vin-supply = <&vcc5v0_sys>;
};
- vcc_cam: vcc-cam {
+ vcc_cam: vcc-cam-regulator {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>;
@@ -193,7 +191,7 @@
};
};
- vcc_mipi: vcc-mipi {
+ vcc_mipi: vcc-mipi-regulator {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
@@ -261,7 +259,6 @@
status = "okay";
};
-#ifdef DTS_NO_LEGACY
&gpu {
mali-supply = <&vdd_gpu>;
status = "okay";
@@ -270,6 +267,8 @@
&hdmi {
avdd-0v9-supply = <&vdda0v9_image>;
avdd-1v8-supply = <&vcca1v8_image>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm1_cec>;
status = "okay";
};
@@ -288,7 +287,6 @@
&hdmi_sound {
status = "okay";
};
-#endif
&i2c0 {
status = "okay";
@@ -324,8 +322,6 @@
pinctrl-0 = <&pmic_int>, <&i2s1m0_mclk>;
rockchip,system-power-controller;
#sound-dai-cells = <0>;
- wakeup-source;
-
vcc1-supply = <&vcc3v3_sys>;
vcc2-supply = <&vcc3v3_sys>;
vcc3-supply = <&vcc3v3_sys>;
@@ -335,6 +331,7 @@
vcc7-supply = <&vcc3v3_sys>;
vcc8-supply = <&vcc3v3_sys>;
vcc9-supply = <&vcc3v3_sys>;
+ wakeup-source;
regulators {
vdd_logic: DCDC_REG1 {
@@ -528,6 +525,18 @@
};
};
+&i2c3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c3m1_xfer>;
+ status = "disabled";
+};
+
+&i2c4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c4m1_xfer>;
+ status = "disabled";
+};
+
&i2c5 {
status = "okay";
@@ -544,13 +553,13 @@
};
};
-#ifdef DTS_NO_LEGACY
&i2s0_8ch {
status = "okay";
};
-#endif
&i2s1_8ch {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2s1m0_sclktx &i2s1m0_lrcktx &i2s1m0_sdi0 &i2s1m0_sdo0>;
rockchip,trcm-sync-tx-only;
status = "okay";
};
@@ -686,6 +695,20 @@
status = "okay";
};
+&sfc {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+
+ flash@0 {
+ compatible = "jedec,spi-nor";
+ reg = <0x0>;
+ spi-max-frequency = <104000000>;
+ spi-rx-bus-width = <4>;
+ spi-tx-bus-width = <1>;
+ };
+};
+
&tsadc {
rockchip,hw-tshut-mode = <1>;
rockchip,hw-tshut-polarity = <0>;
@@ -749,7 +772,6 @@
status = "okay";
};
-#ifdef DTS_NO_LEGACY
&vop {
assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
@@ -766,4 +788,3 @@
remote-endpoint = <&hdmi_in_vp0>;
};
};
-#endif
diff --git a/lede/target/linux/rockchip/patches-6.1/013-v6.11-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch b/lede/target/linux/rockchip/patches-6.1/013-v6.11-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch
new file mode 100644
index 0000000000..698660b724
--- /dev/null
+++ b/lede/target/linux/rockchip/patches-6.1/013-v6.11-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch
@@ -0,0 +1,76 @@
+From b7f824141f4163c64a940f3a69bf6d8b76f77c7f Mon Sep 17 00:00:00 2001
+From: Niklas Cassel
+Date: Wed, 17 Apr 2024 18:42:26 +0200
+Subject: [PATCH] PCI: dw-rockchip: Fix initial PERST# GPIO value
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+PERST# is active low according to the PCIe specification.
+
+However, the existing pcie-dw-rockchip.c driver does:
+
+ gpiod_set_value(..., 0); msleep(100); gpiod_set_value(..., 1);
+
+when asserting + deasserting PERST#.
+
+This is of course wrong, but because all the device trees for this
+compatible string have also incorrectly marked this GPIO as ACTIVE_HIGH:
+
+ $ git grep -B 10 reset-gpios arch/arm64/boot/dts/rockchip/rk3568*
+ $ git grep -B 10 reset-gpios arch/arm64/boot/dts/rockchip/rk3588*
+
+The actual toggling of PERST# is correct, and we cannot change it anyway,
+since that would break device tree compatibility.
+
+However, this driver does request the GPIO to be initialized as
+GPIOD_OUT_HIGH, which does cause a silly sequence where PERST# gets
+toggled back and forth for no good reason.
+
+Fix this by requesting the GPIO to be initialized as GPIOD_OUT_LOW (which
+for this driver means PERST# asserted).
+
+This will avoid an unnecessary signal change where PERST# gets deasserted
+(by devm_gpiod_get_optional()) and then gets asserted (by
+rockchip_pcie_start_link()) just a few instructions later.
+
+Before patch, debug prints on EP side, when booting RC:
+
+ [ 845.606810] pci: PERST# asserted by host!
+ [ 852.483985] pci: PERST# de-asserted by host!
+ [ 852.503041] pci: PERST# asserted by host!
+ [ 852.610318] pci: PERST# de-asserted by host!
+
+After patch, debug prints on EP side, when booting RC:
+
+ [ 125.107921] pci: PERST# asserted by host!
+ [ 132.111429] pci: PERST# de-asserted by host!
+
+This extra, very short, PERST# assertion + deassertion has been reported to
+cause issues with certain WLAN controllers, e.g. RTL8822CE.
+
+Fixes: 0e898eb8df4e ("PCI: rockchip-dwc: Add Rockchip RK356X host controller driver")
+Link: https://lore.kernel.org/linux-pci/20240417164227.398901-1-cassel@kernel.org
+Tested-by: Heiko Stuebner
+Tested-by: Jianfeng Liu
+Signed-off-by: Niklas Cassel
+Signed-off-by: Krzysztof Wilczyński
+Signed-off-by: Bjorn Helgaas
+Reviewed-by: Heiko Stuebner
+Reviewed-by: Manivannan Sadhasivam
+Cc: stable@vger.kernel.org # v5.15+
+---
+ drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c
++++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c
+@@ -240,7 +240,7 @@ static int rockchip_pcie_resource_get(struct platform_device *pdev,
+ return PTR_ERR(rockchip->apb_base);
+
+ rockchip->rst_gpio = devm_gpiod_get_optional(&pdev->dev, "reset",
+- GPIOD_OUT_HIGH);
++ GPIOD_OUT_LOW);
+ if (IS_ERR(rockchip->rst_gpio))
+ return PTR_ERR(rockchip->rst_gpio);
+
diff --git a/lede/target/linux/rockchip/patches-6.6/007-v6.11-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch b/lede/target/linux/rockchip/patches-6.6/007-v6.11-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch
new file mode 100644
index 0000000000..698660b724
--- /dev/null
+++ b/lede/target/linux/rockchip/patches-6.6/007-v6.11-PCI-dw-rockchip-Fix-initial-PERST-GPIO-value.patch
@@ -0,0 +1,76 @@
+From b7f824141f4163c64a940f3a69bf6d8b76f77c7f Mon Sep 17 00:00:00 2001
+From: Niklas Cassel
+Date: Wed, 17 Apr 2024 18:42:26 +0200
+Subject: [PATCH] PCI: dw-rockchip: Fix initial PERST# GPIO value
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+PERST# is active low according to the PCIe specification.
+
+However, the existing pcie-dw-rockchip.c driver does:
+
+ gpiod_set_value(..., 0); msleep(100); gpiod_set_value(..., 1);
+
+when asserting + deasserting PERST#.
+
+This is of course wrong, but because all the device trees for this
+compatible string have also incorrectly marked this GPIO as ACTIVE_HIGH:
+
+ $ git grep -B 10 reset-gpios arch/arm64/boot/dts/rockchip/rk3568*
+ $ git grep -B 10 reset-gpios arch/arm64/boot/dts/rockchip/rk3588*
+
+The actual toggling of PERST# is correct, and we cannot change it anyway,
+since that would break device tree compatibility.
+
+However, this driver does request the GPIO to be initialized as
+GPIOD_OUT_HIGH, which does cause a silly sequence where PERST# gets
+toggled back and forth for no good reason.
+
+Fix this by requesting the GPIO to be initialized as GPIOD_OUT_LOW (which
+for this driver means PERST# asserted).
+
+This will avoid an unnecessary signal change where PERST# gets deasserted
+(by devm_gpiod_get_optional()) and then gets asserted (by
+rockchip_pcie_start_link()) just a few instructions later.
+
+Before patch, debug prints on EP side, when booting RC:
+
+ [ 845.606810] pci: PERST# asserted by host!
+ [ 852.483985] pci: PERST# de-asserted by host!
+ [ 852.503041] pci: PERST# asserted by host!
+ [ 852.610318] pci: PERST# de-asserted by host!
+
+After patch, debug prints on EP side, when booting RC:
+
+ [ 125.107921] pci: PERST# asserted by host!
+ [ 132.111429] pci: PERST# de-asserted by host!
+
+This extra, very short, PERST# assertion + deassertion has been reported to
+cause issues with certain WLAN controllers, e.g. RTL8822CE.
+
+Fixes: 0e898eb8df4e ("PCI: rockchip-dwc: Add Rockchip RK356X host controller driver")
+Link: https://lore.kernel.org/linux-pci/20240417164227.398901-1-cassel@kernel.org
+Tested-by: Heiko Stuebner
+Tested-by: Jianfeng Liu
+Signed-off-by: Niklas Cassel
+Signed-off-by: Krzysztof Wilczyński
+Signed-off-by: Bjorn Helgaas
+Reviewed-by: Heiko Stuebner
+Reviewed-by: Manivannan Sadhasivam
+Cc: stable@vger.kernel.org # v5.15+
+---
+ drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c
++++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c
+@@ -240,7 +240,7 @@ static int rockchip_pcie_resource_get(struct platform_device *pdev,
+ return PTR_ERR(rockchip->apb_base);
+
+ rockchip->rst_gpio = devm_gpiod_get_optional(&pdev->dev, "reset",
+- GPIOD_OUT_HIGH);
++ GPIOD_OUT_LOW);
+ if (IS_ERR(rockchip->rst_gpio))
+ return PTR_ERR(rockchip->rst_gpio);
+
diff --git a/lede/toolchain/gcc/Config.version b/lede/toolchain/gcc/Config.version
index 8670f49b4c..9ffe340663 100644
--- a/lede/toolchain/gcc/Config.version
+++ b/lede/toolchain/gcc/Config.version
@@ -16,5 +16,5 @@ config GCC_VERSION
string
default "8.4.0" if GCC_VERSION_8
default "12.2.0" if GCC_VERSION_12
- default "13.2.0" if GCC_VERSION_13
+ default "13.3.0" if GCC_VERSION_13
default "11.3.0"
diff --git a/lede/toolchain/gcc/common.mk b/lede/toolchain/gcc/common.mk
index a87cf8ccaf..55be62280d 100644
--- a/lede/toolchain/gcc/common.mk
+++ b/lede/toolchain/gcc/common.mk
@@ -41,8 +41,8 @@ ifeq ($(PKG_VERSION),12.2.0)
PKG_HASH:=e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
endif
-ifeq ($(PKG_VERSION),13.2.0)
- PKG_HASH:=e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
+ifeq ($(PKG_VERSION),13.3.0)
+ PKG_HASH:=0845e9621c9543a13f484e94584a49ffc0129970e9914624235fc1d061a0c083
endif
PATCH_DIR=../patches-$(GCC_MAJOR_VERSION).x
diff --git a/lede/toolchain/gcc/patches-13.x/300-mips_Os_cpu_rtx_cost_model.patch b/lede/toolchain/gcc/patches-13.x/300-mips_Os_cpu_rtx_cost_model.patch
index ce21e0433d..2ca42ad777 100644
--- a/lede/toolchain/gcc/patches-13.x/300-mips_Os_cpu_rtx_cost_model.patch
+++ b/lede/toolchain/gcc/patches-13.x/300-mips_Os_cpu_rtx_cost_model.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau
--- a/gcc/config/mips/mips.cc
+++ b/gcc/config/mips/mips.cc
-@@ -20213,7 +20213,7 @@ mips_option_override (void)
+@@ -20219,7 +20219,7 @@ mips_option_override (void)
flag_pcc_struct_return = 0;
/* Decide which rtx_costs structure to use. */
diff --git a/lede/toolchain/gcc/patches-13.x/970-macos_arm64-building-fix.patch b/lede/toolchain/gcc/patches-13.x/970-macos_arm64-building-fix.patch
index 7844268e7e..a0470b1396 100644
--- a/lede/toolchain/gcc/patches-13.x/970-macos_arm64-building-fix.patch
+++ b/lede/toolchain/gcc/patches-13.x/970-macos_arm64-building-fix.patch
@@ -17,7 +17,7 @@ Date: Mon Aug 16 13:16:21 2021 +0100
--- a/gcc/config/aarch64/aarch64.h
+++ b/gcc/config/aarch64/aarch64.h
-@@ -1185,7 +1185,7 @@ extern enum aarch64_code_model aarch64_c
+@@ -1195,7 +1195,7 @@ extern enum aarch64_code_model aarch64_c
/* Extra specs when building a native AArch64-hosted compiler.
Option rewriting rules based on host system. */
diff --git a/lede/tools/b43-tools/Makefile b/lede/tools/b43-tools/Makefile
index bae498c78f..19918efde4 100644
--- a/lede/tools/b43-tools/Makefile
+++ b/lede/tools/b43-tools/Makefile
@@ -23,7 +23,7 @@ define Host/Compile
$(HOST_MAKE_FLAGS) \
$(1) QUIET_SPARSE=:
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/assembler \
- CFLAGS="$(HOST_CFLAGS) -include endian.h" \
+ CFLAGS="$(HOST_CFLAGS) -include endian.h -Wno-error=int-conversion" \
$(HOST_MAKE_FLAGS) \
LDFLAGS= \
$(1) QUIET_SPARSE=:
diff --git a/lede/tools/coreutils/Makefile b/lede/tools/coreutils/Makefile
index c64210c5a7..f799e83c5b 100644
--- a/lede/tools/coreutils/Makefile
+++ b/lede/tools/coreutils/Makefile
@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=coreutils
PKG_CPE_ID:=cpe:/a:gnu:coreutils
-PKG_VERSION:=8.32
+PKG_VERSION:=9.3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/coreutils
-PKG_HASH:=4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa
+PKG_HASH:=adbcfcfe899235b71e8768dcf07cd532520b7f54f9a8064843f8d199a904bbaa
HOST_BUILD_PARALLEL := 1
diff --git a/lede/tools/cpio/Makefile b/lede/tools/cpio/Makefile
index 82b5aa8365..bd6e258980 100644
--- a/lede/tools/cpio/Makefile
+++ b/lede/tools/cpio/Makefile
@@ -3,11 +3,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cpio
PKG_CPE_ID:=cpe:/a:gnu:cpio
-PKG_VERSION:=2.13
+PKG_VERSION:=2.15
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@GNU/cpio
-PKG_HASH:=eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d
+PKG_HASH:=937610b97c329a1ec9268553fb780037bcfff0dcffe9725ebc4fd9c1aa9075db
include $(INCLUDE_DIR)/host-build.mk
diff --git a/lede/tools/cpio/patches/001-duplicate-program-name.patch b/lede/tools/cpio/patches/001-duplicate-program-name.patch
deleted file mode 100644
index a7c3fbc8ae..0000000000
--- a/lede/tools/cpio/patches/001-duplicate-program-name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-author Sergey Poznyakoff
-
-https://git.savannah.gnu.org/cgit/cpio.git/commit/?id=641d3f489cf6238bb916368d4ba0d9325a235afb
-
-* src/global.c: Remove superfluous declaration of program_name
-
---- a/src/global.c
-+++ b/src/global.c
-@@ -184,9 +184,6 @@ unsigned int warn_option = 0;
- /* Extract to standard output? */
- bool to_stdout_option = false;
-
--/* The name this program was run with. */
--char *program_name;
--
- /* A pointer to either lstat or stat, depending on whether
- dereferencing of symlinks is done for input files. */
- int (*xstat) ();
diff --git a/lede/tools/cpio/patches/010-clang.patch b/lede/tools/cpio/patches/010-clang.patch
deleted file mode 100644
index 89c7a8149e..0000000000
--- a/lede/tools/cpio/patches/010-clang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gnu/xalloc-oversized.h
-+++ b/gnu/xalloc-oversized.h
-@@ -52,7 +52,7 @@ typedef size_t __xalloc_count_type;
- #elif ((5 <= __GNUC__ \
- || (__has_builtin (__builtin_mul_overflow) \
- && __has_builtin (__builtin_constant_p))) \
-- && !__STRICT_ANSI__)
-+ && !__STRICT_ANSI__) && !defined(__clang__)
- # define xalloc_oversized(n, s) \
- (__builtin_constant_p (n) && __builtin_constant_p (s) \
- ? __xalloc_oversized (n, s) \
diff --git a/mieru/.github/workflows/external_connect.yaml b/mieru/.github/workflows/external_connect.yaml
index 0d46b40143..c0a1d8a890 100644
--- a/mieru/.github/workflows/external_connect.yaml
+++ b/mieru/.github/workflows/external_connect.yaml
@@ -13,5 +13,5 @@ jobs:
go-version-file: go.mod
- name: Build test binaries
run: make test-binary
- - name: Run packet drop test
+ - name: Run external connection test
run: sudo ./test/deploy/externalconnect/test.sh
diff --git a/mieru/Makefile b/mieru/Makefile
index a6be7ed48c..d92f85c15e 100644
--- a/mieru/Makefile
+++ b/mieru/Makefile
@@ -32,7 +32,7 @@ PROJECT_NAME=$(shell basename "${ROOT}")
# - pkg/version/current.go
#
# Use `tools/bump_version.sh` script to change all those files at one shot.
-VERSION="3.0.1"
+VERSION="3.2.0"
# Build binaries and installation packages.
.PHONY: build
diff --git a/mieru/build/package/mieru/amd64/debian/DEBIAN/control b/mieru/build/package/mieru/amd64/debian/DEBIAN/control
index df8b222d7c..bd913b5c38 100755
--- a/mieru/build/package/mieru/amd64/debian/DEBIAN/control
+++ b/mieru/build/package/mieru/amd64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
Package: mieru
-Version: 3.0.1
+Version: 3.2.0
Section: net
Priority: optional
Architecture: amd64
diff --git a/mieru/build/package/mieru/amd64/rpm/mieru.spec b/mieru/build/package/mieru/amd64/rpm/mieru.spec
index 322bd56ed8..13d5e9ee6d 100644
--- a/mieru/build/package/mieru/amd64/rpm/mieru.spec
+++ b/mieru/build/package/mieru/amd64/rpm/mieru.spec
@@ -1,5 +1,5 @@
Name: mieru
-Version: 3.0.1
+Version: 3.2.0
Release: 1%{?dist}
Summary: Mieru proxy client
License: GPLv3+
diff --git a/mieru/build/package/mieru/arm64/debian/DEBIAN/control b/mieru/build/package/mieru/arm64/debian/DEBIAN/control
index 7be8d11f2f..b95e6b34f2 100755
--- a/mieru/build/package/mieru/arm64/debian/DEBIAN/control
+++ b/mieru/build/package/mieru/arm64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
Package: mieru
-Version: 3.0.1
+Version: 3.2.0
Section: net
Priority: optional
Architecture: arm64
diff --git a/mieru/build/package/mieru/arm64/rpm/mieru.spec b/mieru/build/package/mieru/arm64/rpm/mieru.spec
index 322bd56ed8..13d5e9ee6d 100644
--- a/mieru/build/package/mieru/arm64/rpm/mieru.spec
+++ b/mieru/build/package/mieru/arm64/rpm/mieru.spec
@@ -1,5 +1,5 @@
Name: mieru
-Version: 3.0.1
+Version: 3.2.0
Release: 1%{?dist}
Summary: Mieru proxy client
License: GPLv3+
diff --git a/mieru/build/package/mita/amd64/debian/DEBIAN/control b/mieru/build/package/mita/amd64/debian/DEBIAN/control
index eb0ac7267a..f827359e8c 100755
--- a/mieru/build/package/mita/amd64/debian/DEBIAN/control
+++ b/mieru/build/package/mita/amd64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
Package: mita
-Version: 3.0.1
+Version: 3.2.0
Section: net
Priority: optional
Architecture: amd64
diff --git a/mieru/build/package/mita/amd64/debian/lib/systemd/system/mita.service b/mieru/build/package/mita/amd64/debian/lib/systemd/system/mita.service
index 196f7fc343..0cc38095cc 100644
--- a/mieru/build/package/mita/amd64/debian/lib/systemd/system/mita.service
+++ b/mieru/build/package/mita/amd64/debian/lib/systemd/system/mita.service
@@ -11,7 +11,7 @@ Environment="MITA_LOG_NO_TIMESTAMP=true"
ExecStart=/usr/bin/mita run
Nice=-10
Restart=on-failure
-RestartSec=1
+RestartSec=5
[Install]
WantedBy=multi-user.target
diff --git a/mieru/build/package/mita/amd64/rpm/mita.service b/mieru/build/package/mita/amd64/rpm/mita.service
index c1caf54de6..3aca8f89b6 100644
--- a/mieru/build/package/mita/amd64/rpm/mita.service
+++ b/mieru/build/package/mita/amd64/rpm/mita.service
@@ -11,7 +11,7 @@ Environment="MITA_LOG_NO_TIMESTAMP=true"
ExecStart=/usr/bin/mita run
Nice=-10
Restart=on-failure
-RestartSec=1
+RestartSec=5
[Install]
WantedBy=multi-user.target
diff --git a/mieru/build/package/mita/amd64/rpm/mita.spec b/mieru/build/package/mita/amd64/rpm/mita.spec
index 3a1a00def1..381436d112 100644
--- a/mieru/build/package/mita/amd64/rpm/mita.spec
+++ b/mieru/build/package/mita/amd64/rpm/mita.spec
@@ -1,5 +1,5 @@
Name: mita
-Version: 3.0.1
+Version: 3.2.0
Release: 1%{?dist}
Summary: Mieru proxy server
License: GPLv3+
diff --git a/mieru/build/package/mita/arm64/debian/DEBIAN/control b/mieru/build/package/mita/arm64/debian/DEBIAN/control
index 59d43493ef..265ca1f791 100755
--- a/mieru/build/package/mita/arm64/debian/DEBIAN/control
+++ b/mieru/build/package/mita/arm64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
Package: mita
-Version: 3.0.1
+Version: 3.2.0
Section: net
Priority: optional
Architecture: arm64
diff --git a/mieru/build/package/mita/arm64/debian/lib/systemd/system/mita.service b/mieru/build/package/mita/arm64/debian/lib/systemd/system/mita.service
index 21ff11831c..ec2bed6002 100644
--- a/mieru/build/package/mita/arm64/debian/lib/systemd/system/mita.service
+++ b/mieru/build/package/mita/arm64/debian/lib/systemd/system/mita.service
@@ -11,7 +11,7 @@ Environment="MITA_LOG_NO_TIMESTAMP=true"
ExecStart=/usr/bin/mita run
Nice=-10
Restart=on-failure
-RestartSec=1
+RestartSec=5
[Install]
WantedBy=multi-user.target
diff --git a/mieru/build/package/mita/arm64/rpm/mita.service b/mieru/build/package/mita/arm64/rpm/mita.service
index da47d62173..f969627a0d 100644
--- a/mieru/build/package/mita/arm64/rpm/mita.service
+++ b/mieru/build/package/mita/arm64/rpm/mita.service
@@ -11,7 +11,7 @@ Environment="MITA_LOG_NO_TIMESTAMP=true"
ExecStart=/usr/bin/mita run
Nice=-10
Restart=on-failure
-RestartSec=1
+RestartSec=5
[Install]
WantedBy=multi-user.target
diff --git a/mieru/build/package/mita/arm64/rpm/mita.spec b/mieru/build/package/mita/arm64/rpm/mita.spec
index cdbf5639d0..3b5ca4db35 100644
--- a/mieru/build/package/mita/arm64/rpm/mita.spec
+++ b/mieru/build/package/mita/arm64/rpm/mita.spec
@@ -1,5 +1,5 @@
Name: mita
-Version: 3.0.1
+Version: 3.2.0
Release: 1%{?dist}
Summary: Mieru proxy server
License: GPLv3+
diff --git a/mieru/configs/examples/mita.service b/mieru/configs/examples/mita.service
index 8fffb3ef53..b0d95ed1db 100755
--- a/mieru/configs/examples/mita.service
+++ b/mieru/configs/examples/mita.service
@@ -12,7 +12,7 @@ Environment="MITA_LOG_NO_TIMESTAMP=true"
ExecStart=/usr/bin/mita run
Nice=-10
Restart=on-failure
-RestartSec=1
+RestartSec=5
[Install]
WantedBy=multi-user.target
diff --git a/mieru/docs/client-install.md b/mieru/docs/client-install.md
index dc2fb3c7f9..d08dd0c810 100644
--- a/mieru/docs/client-install.md
+++ b/mieru/docs/client-install.md
@@ -105,6 +105,18 @@ mieru stop
Note that every time you change the settings with `mieru apply config `, you need to restart the client with `mieru stop` and `mieru start` for the new settings to take effect.
+## Test the Connection Between Client and Server
+
+```sh
+mieru test
+
+OR
+
+mieru test https://
+```
+
+If the output shows `Connected to ...`, it indicates that the mieru client has successfully connected to the proxy server.
+
## Configuring the browser
Chrome / Firefox and other browsers can use socks5 proxy to access blocked websites by installing browser plugins. For the address of the socks5 proxy, please fill in `127.0.0.1:xxxx`, where `xxxx` is the value of `socks5Port` in the client settings. This address will also be printed when the `mieru start` command is called.
diff --git a/mieru/docs/client-install.zh_CN.md b/mieru/docs/client-install.zh_CN.md
index 7c4379997d..5940a85a59 100644
--- a/mieru/docs/client-install.zh_CN.md
+++ b/mieru/docs/client-install.zh_CN.md
@@ -105,6 +105,18 @@ mieru stop
注意，每次使用 `mieru apply config ` 修改设置后，需要用 `mieru stop` 和 `mieru start` 重启客户端，才能使新设置生效。
+## 测试客户端与服务器的连接
+
+```sh
+mieru test
+
+或者
+
+mieru test https://
+```
+
+如果输出显示 `Connected to ...`，表示 mieru 客户端成功连接了代理服务器。
+
## 配置浏览器
Chrome / Firefox 等浏览器可以通过安装插件，使用 socks5 代理访问墙外的网站。关于 socks5 代理的地址，请填写 `127.0.0.1:xxxx`，其中 `xxxx` 是客户端设置中 `socks5Port` 的值。这个地址在调用 `mieru start` 指令时也会打印出来。
diff --git a/mieru/docs/operation.md b/mieru/docs/operation.md
index 0e88bbac6e..b8fb4da3c8 100644
--- a/mieru/docs/operation.md
+++ b/mieru/docs/operation.md
@@ -96,7 +96,8 @@ To determine if the connectivity is OK, you can look at the client metrics. To g
},
"replay": {
"KnownSession": 0,
- "NewSession": 0
+ "NewSession": 0,
+ "NewSessionDecrypted": 0
},
"socks5": {
"ConnectionRefusedErrors": 0,
diff --git a/mieru/docs/operation.zh_CN.md b/mieru/docs/operation.zh_CN.md
index 34323a9df5..a5467ec783 100644
--- a/mieru/docs/operation.zh_CN.md
+++ b/mieru/docs/operation.zh_CN.md
@@ -96,7 +96,8 @@ mieru start
},
"replay": {
"KnownSession": 0,
- "NewSession": 0
+ "NewSession": 0,
+ "NewSessionDecrypted": 0
},
"socks5": {
"ConnectionRefusedErrors": 0,
diff --git a/mieru/docs/server-install.md b/mieru/docs/server-install.md
index 4542a71108..134deb8509 100644
--- a/mieru/docs/server-install.md
+++ b/mieru/docs/server-install.md
@@ -8,32 +8,32 @@ Before installation and configuration, connect to the server via SSH and then ex
```sh
# Debian / Ubuntu - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita_3.0.1_amd64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.2.0/mita_3.2.0_amd64.deb
# Debian / Ubuntu - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita_3.0.1_arm64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.2.0/mita_3.2.0_arm64.deb
# RedHat / CentOS / Rocky Linux - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita-3.0.1-1.x86_64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.2.0/mita-3.2.0-1.x86_64.rpm
# RedHat / CentOS / Rocky Linux - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita-3.0.1-1.aarch64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.2.0/mita-3.2.0-1.aarch64.rpm
```
## Install mita package
```sh
# Debian / Ubuntu - X86_64
-sudo dpkg -i mita_3.0.1_amd64.deb
+sudo dpkg -i mita_3.2.0_amd64.deb
# Debian / Ubuntu - ARM 64
-sudo dpkg -i mita_3.0.1_arm64.deb
+sudo dpkg -i mita_3.2.0_arm64.deb
# RedHat / CentOS / Rocky Linux - X86_64
-sudo rpm -Uvh --force mita-3.0.1-1.x86_64.rpm
+sudo rpm -Uvh --force mita-3.2.0-1.x86_64.rpm
# RedHat / CentOS / Rocky Linux - ARM 64
-sudo rpm -Uvh --force mita-3.0.1-1.aarch64.rpm
+sudo rpm -Uvh --force mita-3.2.0-1.aarch64.rpm
```
Those instructions can also be used to upgrade the version of mita software package.
diff --git a/mieru/docs/server-install.zh_CN.md b/mieru/docs/server-install.zh_CN.md
index 4e8b42fd9c..c4b7e1ec91 100644
--- a/mieru/docs/server-install.zh_CN.md
+++ b/mieru/docs/server-install.zh_CN.md
@@ -8,32 +8,32 @@
```sh
# Debian / Ubuntu - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita_3.0.1_amd64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.2.0/mita_3.2.0_amd64.deb
# Debian / Ubuntu - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita_3.0.1_arm64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.2.0/mita_3.2.0_arm64.deb
# RedHat / CentOS / Rocky Linux - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita-3.0.1-1.x86_64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.2.0/mita-3.2.0-1.x86_64.rpm
# RedHat / CentOS / Rocky Linux - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.0.1/mita-3.0.1-1.aarch64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.2.0/mita-3.2.0-1.aarch64.rpm
```
## 安装 mita 软件包
```sh
# Debian / Ubuntu - X86_64
-sudo dpkg -i mita_3.0.1_amd64.deb
+sudo dpkg -i mita_3.2.0_amd64.deb
# Debian / Ubuntu - ARM 64
-sudo dpkg -i mita_3.0.1_arm64.deb
+sudo dpkg -i mita_3.2.0_arm64.deb
# RedHat / CentOS / Rocky Linux - X86_64
-sudo rpm -Uvh --force mita-3.0.1-1.x86_64.rpm
+sudo rpm -Uvh --force mita-3.2.0-1.x86_64.rpm
# RedHat / CentOS / Rocky Linux - ARM 64
-sudo rpm -Uvh --force mita-3.0.1-1.aarch64.rpm
+sudo rpm -Uvh --force mita-3.2.0-1.aarch64.rpm
```
上述指令也可以用来升级 mita 软件包的版本。
diff --git a/mieru/pkg/cipher/cache.go b/mieru/pkg/cipher/cache.go
index 745ffff175..35d78b31ee 100644
--- a/mieru/pkg/cipher/cache.go
+++ b/mieru/pkg/cipher/cache.go
@@ -21,7 +21,7 @@ import (
"time"
)
-const cacheValidInterval = KeyRefreshInterval / 2
+const cacheValidInterval = KeyRefreshInterval / 4
type cachedCiphers struct {
cipherList []BlockCipher
diff --git a/mieru/pkg/cli/client.go b/mieru/pkg/cli/client.go
index a1cd38a255..cadf6c803e 100644
--- a/mieru/pkg/cli/client.go
+++ b/mieru/pkg/cli/client.go
@@ -23,10 +23,11 @@ import (
"io"
"net"
"net/http"
- "net/url"
+ "os"
"os/exec"
"runtime/pprof"
"strconv"
+ "strings"
"sync"
"time"
@@ -38,10 +39,10 @@ import (
"github.com/enfein/mieru/pkg/metrics"
"github.com/enfein/mieru/pkg/protocolv2"
"github.com/enfein/mieru/pkg/socks5"
+ "github.com/enfein/mieru/pkg/socks5client"
"github.com/enfein/mieru/pkg/stderror"
"github.com/enfein/mieru/pkg/util"
"github.com/enfein/mieru/pkg/util/sockopts"
- "golang.org/x/net/proxy"
"google.golang.org/grpc"
"google.golang.org/protobuf/proto"
)
@@ -86,7 +87,15 @@ func RegisterClientCommands() {
RegisterCallback(
[]string{"", "test"},
func(s []string) error {
- return unexpectedArgsError(s, 2)
+ if len(s) > 3 {
+ return fmt.Errorf("usage: mieru test [URL]. More than 1 URL is provided")
+ }
+ if len(s) == 3 {
+ if !strings.HasPrefix(s[2], "http://") && !strings.HasPrefix(s[2], "https://") {
+ return fmt.Errorf("provided URL is invalid, it must start with %q or %q", "http://", "https://")
+ }
+ }
+ return nil
},
clientTestFunc,
)
@@ -236,7 +245,7 @@ var clientHelpFunc = func(s []string) error {
help: "Check mieru client status.",
},
{
- cmd: "test",
+ cmd: "test [URL]",
help: "Test mieru client connection to the Internet via proxy server.",
},
{
@@ -334,6 +343,8 @@ var clientStartFunc = func(s []string) error {
if errors.Is(cmd.Err, exec.ErrDot) {
cmd.Err = nil
}
+ cmd.Stdout = os.Stdout
+ cmd.Stderr = os.Stderr
if err := cmd.Start(); err != nil {
return fmt.Errorf(stderror.StartClientFailedErr, err)
}
@@ -612,17 +623,9 @@ var clientTestFunc = func(s []string) error {
return fmt.Errorf(stderror.GetClientConfigFailedErr, err)
}
- proxyURL, err := url.Parse(fmt.Sprintf("socks5://127.0.0.1:%d", config.GetSocks5Port()))
- if err != nil {
- return fmt.Errorf("failed to parse proxy URL: %w", err)
- }
- dialer, err := proxy.FromURL(proxyURL, proxy.Direct)
- if err != nil {
- return fmt.Errorf("failed to create proxy dialer: %w", err)
- }
httpClient := &http.Client{
Transport: &http.Transport{
- Dial: dialer.Dial,
+ Dial: socks5client.Dial(fmt.Sprintf("socks5://127.0.0.1:%d", config.GetSocks5Port()), socks5client.ConnectCmd),
},
CheckRedirect: func(req *http.Request, via []*http.Request) error {
return nil
@@ -630,8 +633,12 @@ var clientTestFunc = func(s []string) error {
Timeout: appctl.RPCTimeout,
}
+ destination := "https://google.com/generate_204"
+ if len(s) == 3 {
+ destination = s[2]
+ }
beginTime := time.Now()
- resp, err := httpClient.Get("https://google.com/generate_204")
+ resp, err := httpClient.Get(destination)
if err != nil {
return err
}
@@ -640,10 +647,10 @@ var clientTestFunc = func(s []string) error {
defer resp.Body.Close()
io.ReadAll(resp.Body)
- if resp.StatusCode != 204 {
+ if resp.StatusCode < 200 || resp.StatusCode >= 300 {
return fmt.Errorf("received unexpected status code %d after %v", resp.StatusCode, d)
}
- log.Infof("Connected to https://google.com after %v", d)
+ log.Infof("Connected to %q after %v", destination, d)
return nil
}
diff --git a/mieru/pkg/cli/server.go b/mieru/pkg/cli/server.go
index 23630bd209..4df1dacb4a 100644
--- a/mieru/pkg/cli/server.go
+++ b/mieru/pkg/cli/server.go
@@ -279,6 +279,9 @@ var serverHelpFunc = func(s []string) error {
var serverStartFunc = func(s []string) error {
appStatus, err := appctl.GetServerStatusWithRPC(context.Background())
if err != nil {
+ if stderror.IsConnRefused(err) {
+ return fmt.Errorf(stderror.ServerNotRunningWithCommand)
+ }
return fmt.Errorf(stderror.GetServerStatusFailedErr, err)
}
if err := appctl.IsServerDaemonRunning(appStatus); err != nil {
@@ -461,6 +464,9 @@ var serverRunFunc = func(s []string) error {
var serverStopFunc = func(s []string) error {
appStatus, err := appctl.GetServerStatusWithRPC(context.Background())
if err != nil {
+ if stderror.IsConnRefused(err) {
+ return fmt.Errorf(stderror.ServerNotRunningWithCommand)
+ }
return fmt.Errorf(stderror.GetServerStatusFailedErr, err)
}
if err := appctl.IsServerDaemonRunning(appStatus); err != nil {
@@ -487,6 +493,9 @@ var serverStopFunc = func(s []string) error {
var serverReloadFunc = func(s []string) error {
appStatus, err := appctl.GetServerStatusWithRPC(context.Background())
if err != nil {
+ if stderror.IsConnRefused(err) {
+ return fmt.Errorf(stderror.ServerNotRunningWithCommand)
+ }
return fmt.Errorf(stderror.GetServerStatusFailedErr, err)
}
if err := appctl.IsServerDaemonRunning(appStatus); err != nil {
@@ -510,15 +519,14 @@ var serverStatusFunc = func(s []string) error {
appStatus, err := appctl.GetServerStatusWithRPC(context.Background())
if err != nil {
if stderror.IsConnRefused(err) {
- // This is the most common reason, no need to show more details.
- return fmt.Errorf(stderror.ServerNotRunning)
+ return fmt.Errorf(stderror.ServerNotRunningWithCommand)
} else if stderror.IsPermissionDenied(err) {
currentUser, err := user.Current()
if err != nil {
cmd := strings.Join(s, " ")
return fmt.Errorf("unable to determine the OS user which executed command %q", cmd)
}
- return fmt.Errorf("unable to connect to mita server daemon via %q, please retry after running \"sudo usermod -a -G mita %s\" command and logout the system, then login again", appctl.ServerUDS(), currentUser.Username)
+ return fmt.Errorf("unable to connect to mita server daemon via %q; please retry after running \"sudo usermod -a -G mita %s\" command and logout the system, then login again", appctl.ServerUDS(), currentUser.Username)
} else {
return fmt.Errorf(stderror.GetServerStatusFailedErr, err)
}
@@ -537,6 +545,9 @@ var serverStatusFunc = func(s []string) error {
var serverApplyConfigFunc = func(s []string) error {
appStatus, err := appctl.GetServerStatusWithRPC(context.Background())
if err != nil {
+ if stderror.IsConnRefused(err) {
+ return fmt.Errorf(stderror.ServerNotRunningWithCommand)
+ }
return fmt.Errorf(stderror.GetServerStatusFailedErr, err)
}
if err := appctl.IsServerDaemonRunning(appStatus); err != nil {
@@ -572,6 +583,9 @@ var serverApplyConfigFunc = func(s []string) error {
var serverDescribeConfigFunc = func(s []string) error {
appStatus, err := appctl.GetServerStatusWithRPC(context.Background())
if err != nil {
+ if stderror.IsConnRefused(err) {
+ return fmt.Errorf(stderror.ServerNotRunningWithCommand)
+ }
return fmt.Errorf(stderror.GetServerStatusFailedErr, err)
}
if err := appctl.IsServerDaemonRunning(appStatus); err != nil {
@@ -599,6 +613,9 @@ var serverDescribeConfigFunc = func(s []string) error {
var serverDeleteUserFunc = func(s []string) error {
appStatus, err := appctl.GetServerStatusWithRPC(context.Background())
if err != nil {
+ if stderror.IsConnRefused(err) {
+ return fmt.Errorf(stderror.ServerNotRunningWithCommand)
+ }
return fmt.Errorf(stderror.GetServerStatusFailedErr, err)
}
if err := appctl.IsServerDaemonRunning(appStatus); err != nil {
@@ -640,6 +657,9 @@ var serverDeleteUserFunc = func(s []string) error {
var serverGetMetricsFunc = func(s []string) error {
appStatus, err := appctl.GetServerStatusWithRPC(context.Background())
if err != nil {
+ if stderror.IsConnRefused(err) {
+ return fmt.Errorf(stderror.ServerNotRunningWithCommand)
+ }
return fmt.Errorf(stderror.GetServerStatusFailedErr, err)
}
if err := appctl.IsServerDaemonRunning(appStatus); err != nil {
@@ -663,6 +683,9 @@ var serverGetMetricsFunc = func(s []string) error {
var serverGetConnectionsFunc = func(s []string) error {
appStatus, err := appctl.GetServerStatusWithRPC(context.Background())
if err != nil {
+ if stderror.IsConnRefused(err) {
+ return fmt.Errorf(stderror.ServerNotRunningWithCommand)
+ }
return fmt.Errorf(stderror.GetServerStatusFailedErr, err)
}
if err := appctl.IsServerDaemonRunning(appStatus); err != nil {
diff --git a/mieru/pkg/log/formatter.go b/mieru/pkg/log/formatter.go
index edd784ebf4..08d675a778 100644
--- a/mieru/pkg/log/formatter.go
+++ b/mieru/pkg/log/formatter.go
@@ -3,6 +3,7 @@ package log
import (
"bytes"
"fmt"
+ "os"
"sort"
"strings"
"time"
@@ -55,6 +56,7 @@ func (f *CliFormatter) Format(entry *Entry) ([]byte, error) {
}
// DaemonFormatter is the a log formatter that is suitable for daemon.
+// FATAL log is also printed to stderr.
type DaemonFormatter struct {
NoTimestamp bool
}
@@ -118,6 +120,11 @@ func (f *DaemonFormatter) Format(entry *Entry) ([]byte, error) {
buf.WriteString(value)
}
buf.WriteString("\n")
+
+ if entry.Level == FatalLevel {
+ fmt.Fprint(os.Stderr, buf.String())
+ }
+
return buf.Bytes(), nil
}
diff --git a/mieru/pkg/protocolv2/mux.go b/mieru/pkg/protocolv2/mux.go
index 098d8d224d..4f47972d0b 100644
--- a/mieru/pkg/protocolv2/mux.go
+++ b/mieru/pkg/protocolv2/mux.go
@@ -23,7 +23,6 @@ import (
mrand "math/rand"
"net"
"reflect"
- "runtime"
"strings"
"sync"
"time"
@@ -38,23 +37,21 @@ import (
)
const (
- idleUnderlayTickerInterval = 5 * time.Second
- userCipherCacheWarmInterval = 15 * time.Second
+ idleUnderlayTickerInterval = 5 * time.Second
)
// Mux manages the sessions and underlays.
type Mux struct {
// ---- common fields ----
- isClient bool
- endpoints []UnderlayProperties
- underlays []Underlay
- chAccept chan net.Conn
- chAcceptErr chan error
- used bool
- done chan struct{}
- mu sync.Mutex
- cleaner *time.Ticker
- userCipherCacheWarmer *time.Ticker
+ isClient bool
+ endpoints []UnderlayProperties
+ underlays []Underlay
+ chAccept chan net.Conn
+ chAcceptErr chan error
+ used bool
+ done chan struct{}
+ mu sync.Mutex
+ cleaner *time.Ticker
// ---- client fields ----
password []byte
@@ -74,13 +71,12 @@ func NewMux(isClinet bool) *Mux {
log.Infof("Initializing server multiplexer")
}
mux := &Mux{
- isClient: isClinet,
- underlays: make([]Underlay, 0),
- chAccept: make(chan net.Conn, sessionChanCapacity),
- chAcceptErr: make(chan error, 1), // non-blocking
- done: make(chan struct{}),
- cleaner: time.NewTicker(idleUnderlayTickerInterval),
- userCipherCacheWarmer: time.NewTicker(userCipherCacheWarmInterval),
+ isClient: isClinet,
+ underlays: make([]Underlay, 0),
+ chAccept: make(chan net.Conn, sessionChanCapacity),
+ chAcceptErr: make(chan error, 1), // non-blocking
+ done: make(chan struct{}),
+ cleaner: time.NewTicker(idleUnderlayTickerInterval),
}
// Run maintenance tasks in the background.
@@ -89,13 +85,14 @@ func NewMux(isClinet bool) *Mux {
select {
case <-mux.cleaner.C:
mux.mu.Lock()
- mux.cleanUnderlay()
+ if isClinet {
+ mux.cleanUnderlay(true)
+ } else {
+ mux.cleanUnderlay(false)
+ }
mux.mu.Unlock()
- case <-mux.userCipherCacheWarmer.C:
- mux.warmUserCipherCache()
case <-mux.done:
mux.cleaner.Stop()
- mux.userCipherCacheWarmer.Stop()
return
}
}
@@ -268,7 +265,7 @@ func (m *Mux) DialContext(ctx context.Context) (net.Conn, error) {
var err error
// Try to find a underlay for the session.
- m.cleanUnderlay()
+ m.cleanUnderlay(true)
underlay := m.maybePickExistingUnderlay()
if underlay == nil {
underlay, err = m.newUnderlay(ctx)
@@ -401,7 +398,7 @@ func (m *Mux) acceptUnderlayLoop(ctx context.Context, properties UnderlayPropert
log.Debugf("Created new server underlay %v", underlay)
m.mu.Lock()
m.underlays = append(m.underlays, underlay)
- m.cleanUnderlay()
+ m.cleanUnderlay(false)
m.mu.Unlock()
UnderlayPassiveOpens.Add(1)
currEst := UnderlayCurrEstablished.Add(1)
@@ -456,7 +453,7 @@ func (m *Mux) acceptUnderlayLoop(ctx context.Context, properties UnderlayPropert
log.Infof("Created new server underlay %v", underlay)
m.mu.Lock()
m.underlays = append(m.underlays, underlay)
- m.cleanUnderlay()
+ m.cleanUnderlay(false)
m.mu.Unlock()
UnderlayPassiveOpens.Add(1)
currEst := UnderlayCurrEstablished.Add(1)
@@ -608,67 +605,32 @@ func (m *Mux) maybePickExistingUnderlay() Underlay {
// cleanUnderlay removes closed underlays.
// This method MUST be called only when holding the mu lock.
-func (m *Mux) cleanUnderlay() {
+func (m *Mux) cleanUnderlay(alsoDisableIdleUnderlay bool) {
remaining := make([]Underlay, 0)
- cnt := 0
+ disable := 0
+ close := 0
for _, underlay := range m.underlays {
select {
case <-underlay.Done():
default:
- if underlay.Scheduler().Idle() {
+ if alsoDisableIdleUnderlay && underlay.NSessions() == 0 {
+ if underlay.Scheduler().TryDisable() {
+ disable++
+ }
+ }
+ if underlay.NSessions() == 0 && underlay.Scheduler().Idle() {
underlay.Close()
- cnt++
+ close++
} else {
remaining = append(remaining, underlay)
}
}
}
m.underlays = remaining
- if cnt > 0 {
- log.Debugf("Mux cleaned %d underlays", cnt)
- }
-}
-
-func (m *Mux) warmUserCipherCache() {
- if m.isClient {
- return
- }
-
- m.mu.Lock()
- userList := make([]*appctlpb.User, len(m.users))
- i := 0
- for _, user := range m.users {
- userList[i] = user
- i++
- }
- m.mu.Unlock()
-
- warmSingleUser := func(user *appctlpb.User) {
- password, err := hex.DecodeString(user.GetHashedPassword())
- if err != nil {
- return
- }
- if len(password) == 0 {
- password = cipher.HashPassword([]byte(user.GetPassword()), []byte(user.GetName()))
- }
- cipher.BlockCipherListFromPassword(password, true)
- }
-
- cpus := runtime.NumCPU()
- if len(userList) <= cpus {
- for _, user := range userList {
- warmSingleUser(user)
- }
- } else {
- // Do parallel.
- for i := 0; i < cpus; i++ {
- go func(userList []*appctlpb.User, workerID int, nWorker int) {
- for j := 0; j < len(userList); j++ {
- if j%nWorker == workerID {
- warmSingleUser(userList[j])
- }
- }
- }(userList, i, cpus)
- }
+ if disable > 0 {
+ log.Debugf("Mux disabled scheduling from %d underlays", disable)
+ }
+ if close > 0 {
+ log.Debugf("Mux cleaned %d underlays", close)
}
}
diff --git a/mieru/pkg/protocolv2/scheduler.go b/mieru/pkg/protocolv2/scheduler.go
index f73ab50fe7..5b05111ff2 100644
--- a/mieru/pkg/protocolv2/scheduler.go
+++ b/mieru/pkg/protocolv2/scheduler.go
@@ -24,25 +24,25 @@ import (
)
var (
- // scheduleIdleTime determines when an idle underlay should be closed.
- // It may take 5 seconds to 15 seconds in different machines.
- scheduleIdleTime = time.Duration(5+rng.FixedInt(11)) * time.Second
+ // scheduleIdleTime determines when a underlay is considered idle.
+ // It takes 60 seconds to 120 seconds in different machines.
+ scheduleIdleTime = time.Duration(60+rng.FixedInt(61)) * time.Second
)
// ScheduleController controls scheduling a new client session to a underlay.
type ScheduleController struct {
pending int // number of pending sessions going to be scheduled
lastScheduleTime time.Time
- disable bool // if scheduling to the underlay is disabled
- disableTime time.Time
+ disableTime time.Time // if set, scheduling to the underlay is disabled after this time
mu sync.Mutex
}
// IncPending increases the number of pending sessions by 1.
+// The number of pending sessions can't increase if the scheduler is disabled.
func (c *ScheduleController) IncPending() (ok bool) {
c.mu.Lock()
defer c.mu.Unlock()
- if c.disable {
+ if !util.IsZeroTime(c.disableTime) && time.Since(c.disableTime) > 0 {
return false
}
c.pending++
@@ -51,48 +51,51 @@ func (c *ScheduleController) IncPending() (ok bool) {
}
// DecPending decreases the number of pending sessions by 1.
-func (c *ScheduleController) DecPending() (ok bool) {
+func (c *ScheduleController) DecPending() {
c.mu.Lock()
defer c.mu.Unlock()
- if c.disable {
- return false
- }
c.pending--
c.lastScheduleTime = time.Now()
- return true
}
// IsDisabled returns true if scheduling new sessions to the underlay is disabled.
func (c *ScheduleController) IsDisabled() bool {
c.mu.Lock()
defer c.mu.Unlock()
- return c.disable
+ return !util.IsZeroTime(c.disableTime) && time.Since(c.disableTime) > 0
}
-// Idle returns true if the scheduling has been disabled for the given interval time.
+// Idle returns true if the scheduling has been disabled for the given interval.
func (c *ScheduleController) Idle() bool {
c.mu.Lock()
defer c.mu.Unlock()
- return c.disable && time.Since(c.disableTime) > scheduleIdleTime
+ return !util.IsZeroTime(c.disableTime) && time.Since(c.lastScheduleTime) > scheduleIdleTime && time.Since(c.disableTime) > scheduleIdleTime
}
// TryDisable tries to disable scheduling new sessions.
-func (c *ScheduleController) TryDisable() (ok bool) {
+func (c *ScheduleController) TryDisable() (successful bool) {
c.mu.Lock()
defer c.mu.Unlock()
+ if !util.IsZeroTime(c.disableTime) {
+ return false // already disabled
+ }
if c.pending > 0 {
return false
}
- if util.IsZeroTime(c.lastScheduleTime) {
- c.lastScheduleTime = time.Now()
- }
- if time.Since(c.lastScheduleTime) < scheduleIdleTime {
+ if !util.IsZeroTime(c.lastScheduleTime) && time.Since(c.lastScheduleTime) < scheduleIdleTime {
return false
}
- if c.disable {
- return true
- }
- c.disable = true
c.disableTime = time.Now()
return true
}
+
+// SetRemainingTime disables the scheduler after the given duration.
+// Do nothing if the scheduler has already been disabled.
+func (c *ScheduleController) SetRemainingTime(d time.Duration) {
+ c.mu.Lock()
+ defer c.mu.Unlock()
+ if d <= 0 || !util.IsZeroTime(c.disableTime) {
+ return
+ }
+ c.disableTime = time.Now().Add(d)
+}
diff --git a/mieru/pkg/protocolv2/underlay.go b/mieru/pkg/protocolv2/underlay.go
index 19897d438b..2ae2fad8ee 100644
--- a/mieru/pkg/protocolv2/underlay.go
+++ b/mieru/pkg/protocolv2/underlay.go
@@ -67,7 +67,10 @@ type Underlay interface {
// The session is destroyed when this returns.
RemoveSession(*Session) error
- // Returns information of all the sessions.
+ // Returns the number of sessions.
+ NSessions() int
+
+ // Returns detailed information of all the sessions.
Sessions() []SessionInfo
// Run event loop.
diff --git a/mieru/pkg/protocolv2/underlay_base.go b/mieru/pkg/protocolv2/underlay_base.go
index 419666421f..948cdf3b70 100644
--- a/mieru/pkg/protocolv2/underlay_base.go
+++ b/mieru/pkg/protocolv2/underlay_base.go
@@ -168,22 +168,18 @@ func (b *baseUnderlay) RemoveSession(s *Session) error {
s.wg.Wait()
s.conn = nil
s = nil
-
- if b.isClient {
- // May disable scheduling if the underlay has no session.
- sessions := 0
- b.sessionMap.Range(func(k, v any) bool {
- sessions += 1
- return false
- })
- if sessions == 0 {
- b.scheduler.TryDisable()
- }
- }
-
return nil
}
+func (b *baseUnderlay) NSessions() int {
+ n := 0
+ b.sessionMap.Range(func(k, v any) bool {
+ n++
+ return true
+ })
+ return n
+}
+
func (b *baseUnderlay) Sessions() []SessionInfo {
res := make([]SessionInfo, 0)
b.sessionMap.Range(func(k, v any) bool {
diff --git a/mieru/pkg/protocolv2/underlay_udp.go b/mieru/pkg/protocolv2/underlay_udp.go
index 387dc64fcc..f875a855d9 100644
--- a/mieru/pkg/protocolv2/underlay_udp.go
+++ b/mieru/pkg/protocolv2/underlay_udp.go
@@ -102,6 +102,8 @@ func NewUDPUnderlay(ctx context.Context, network, laddr, raddr string, mtu int,
serverAddr: remoteAddr,
block: block,
}
+ // The block cipher expires after this time.
+ u.scheduler.SetRemainingTime(cipher.KeyRefreshInterval / 2)
return u, nil
}
diff --git a/mieru/pkg/stderror/template.go b/mieru/pkg/stderror/template.go
index d78c7dd9a5..9eb22c2fe6 100644
--- a/mieru/pkg/stderror/template.go
+++ b/mieru/pkg/stderror/template.go
@@ -22,9 +22,9 @@ const (
ClientNotRunning = "mieru client is not running"
ClientNotRunningErr = "mieru client is not running: %w"
CreateClientLifecycleRPCClientFailedErr = "create mieru client lifecycle RPC client failed: %w"
- CreateEmptyServerConfigFailedErr = "create empty mieru server config file failed: %w"
- CreateServerConfigRPCClientFailedErr = "create mieru server config RPC client failed: %w"
- CreateServerLifecycleRPCClientFailedErr = "create mieru server lifecycle RPC client failed: %w"
+ CreateEmptyServerConfigFailedErr = "create empty mita server config file failed: %w"
+ CreateServerConfigRPCClientFailedErr = "create mita server config RPC client failed: %w"
+ CreateServerLifecycleRPCClientFailedErr = "create mita server lifecycle RPC client failed: %w"
CreateSocks5ServerFailedErr = "create socks5 server failed: %w"
DecodeHashedPasswordFailedErr = "decode hashed password failed: %w"
ExitFailedErr = "process exit failed: %w"
@@ -33,23 +33,23 @@ const (
GetHeapProfileFailedErr = "get heap profile failed: %w"
GetMemoryStatisticsFailedErr = "get memory statistics failed: %w"
GetMetricsFailedErr = "get metrics failed: %w"
- GetServerConfigFailedErr = "get mieru server config failed: %w"
- GetServerStatusFailedErr = "get mieru server status failed: %w"
+ GetServerConfigFailedErr = "get mita server config failed: %w"
+ GetServerStatusFailedErr = "get mita server status failed: %w"
GetThreadDumpFailedErr = "get thread dump failed: %w"
InvalidPortBindingsErr = "invalid port bindings: %w"
InvalidTransportProtocol = "invalid transport protocol"
LookupIPFailedErr = "look up IP address failed: %w"
ParseIPFailed = "parse IP address failed"
- ReloadServerFailedErr = "reload mieru server failed: %w"
+ ReloadServerFailedErr = "reload mita server failed: %w"
SegmentSizeTooBig = "segment size too big"
- ServerNotRunning = "mieru server daemon is not running"
- ServerNotRunningErr = "mieru server daemon is not running: %w"
- ServerProxyNotRunningErr = "mieru server proxy is not running: %w"
- SetServerConfigFailedErr = "set mieru server config failed: %w"
+ ServerNotRunningErr = "mita server daemon is not running: %w"
+ ServerNotRunningWithCommand = "mita server daemon is not running; please run command \"sudo systemctl restart mita\" to start server daemon; run command \"sudo journalctl -e -u mita --no-pager\" to check log if unable to start"
+ ServerProxyNotRunningErr = "mita server proxy is not running: %w"
+ SetServerConfigFailedErr = "set mita server config failed: %w"
StartClientFailedErr = "start mieru client failed: %w"
StartCPUProfileFailedErr = "start CPU profile failed: %w"
- StartServerProxyFailedErr = "start mieru server proxy failed: %w"
- StopServerProxyFailedErr = "stop mieru server proxy failed: %w"
+ StartServerProxyFailedErr = "start mita server proxy failed: %w"
+ StopServerProxyFailedErr = "stop mita server proxy failed: %w"
StoreClientConfigFailedErr = "store mieru client config failed: %w"
ValidateFullClientConfigFailedErr = "validate full client config failed: %w"
ValidateServerConfigPatchFailedErr = "validate server config patch failed: %w"
diff --git a/mieru/pkg/util/sockopts/reuse.go b/mieru/pkg/util/sockopts/reuse.go
index 1981c77a41..e2dae92357 100644
--- a/mieru/pkg/util/sockopts/reuse.go
+++ b/mieru/pkg/util/sockopts/reuse.go
@@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-//go:build !(android || linux)
+//go:build !(android || darwin || linux)
package sockopts
@@ -21,7 +21,7 @@ import (
"syscall"
)
-// ReuseAddrPort does nothing outside Android and Linux platform.
+// ReuseAddrPort does nothing in unsupported platforms.
func ReuseAddrPort() Control {
return func(network, address string, conn syscall.RawConn) error {
return nil
diff --git a/mieru/pkg/util/sockopts/reuse_unix.go b/mieru/pkg/util/sockopts/reuse_unix.go
index 6bf868ef7f..27c14a4899 100644
--- a/mieru/pkg/util/sockopts/reuse_unix.go
+++ b/mieru/pkg/util/sockopts/reuse_unix.go
@@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-//go:build android || linux
+//go:build android || darwin || linux
package sockopts
diff --git a/mieru/pkg/version/current.go b/mieru/pkg/version/current.go
index 0d2df57320..e081444a09 100644
--- a/mieru/pkg/version/current.go
+++ b/mieru/pkg/version/current.go
@@ -16,5 +16,5 @@
package version
const (
- AppVersion = "3.0.1"
+ AppVersion = "3.2.0"
)
diff --git a/mieru/test/deploy/externalconnect/libtest.sh b/mieru/test/deploy/externalconnect/libtest.sh
index 7a0a36494e..b5fd2e3105 100755
--- a/mieru/test/deploy/externalconnect/libtest.sh
+++ b/mieru/test/deploy/externalconnect/libtest.sh
@@ -26,13 +26,15 @@ function run_external_connect_test() {
echo "Failed $failure_count times with $i runs."
if [[ "$failure_count" -ge 2 ]]; then
echo "Test failed: too many runs have a non-zero exit code."
- exit 1
+ return 1
fi
else
((success_count++))
fi
sleep 1
done
+
+ return 0
}
function print_mieru_client_log() {
@@ -45,14 +47,16 @@ function delete_mieru_client_log() {
rm -rf $HOME/.cache/mieru/*.log
}
-function print_mieru_server_thread_dump() {
- echo "========== BEGIN OF MIERU SERVER THREAD DUMP =========="
- ./mita get thread-dump
- echo "========== END OF MIERU SERVER THREAD DUMP =========="
+function print_mieru_client_metrics() {
+ echo "========== BEGIN OF MIERU CLIENT METRICS =========="
+ ./mieru get metrics
+ ./mieru get memory-statistics
+ echo "========== END OF MIERU CLIENT METRICS =========="
}
-function print_mieru_client_thread_dump() {
- echo "========== BEGIN OF MIERU CLIENT THREAD DUMP =========="
- ./mieru get thread-dump
- echo "========== END OF MIERU CLIENT THREAD DUMP =========="
+function print_mieru_server_metrics() {
+ echo "========== BEGIN OF MIERU SERVER METRICS =========="
+ ./mita get metrics
+ ./mita get memory-statistics
+ echo "========== END OF MIERU SERVER METRICS =========="
}
diff --git a/mieru/test/deploy/externalconnect/server_tcp.json b/mieru/test/deploy/externalconnect/server_tcp.json
index 2352525b10..201539f0ad 100644
--- a/mieru/test/deploy/externalconnect/server_tcp.json
+++ b/mieru/test/deploy/externalconnect/server_tcp.json
@@ -26,5 +26,5 @@
"advancedSettings": {
"allowLocalDestination": true
},
- "loggingLevel": "DEBUG"
+ "loggingLevel": "TRACE"
}
diff --git a/mieru/test/deploy/externalconnect/server_udp.json b/mieru/test/deploy/externalconnect/server_udp.json
index 9bdb561853..884e01ed3c 100644
--- a/mieru/test/deploy/externalconnect/server_udp.json
+++ b/mieru/test/deploy/externalconnect/server_udp.json
@@ -26,6 +26,6 @@
"advancedSettings": {
"allowLocalDestination": true
},
- "loggingLevel": "DEBUG",
+ "loggingLevel": "TRACE",
"mtu": 1500
}
diff --git a/mieru/test/deploy/externalconnect/test_tcp.sh b/mieru/test/deploy/externalconnect/test_tcp.sh
index 44ed557c8d..497dcbe2de 100755
--- a/mieru/test/deploy/externalconnect/test_tcp.sh
+++ b/mieru/test/deploy/externalconnect/test_tcp.sh
@@ -58,6 +58,14 @@ fi
# Start testing.
sleep 2
run_external_connect_test
+if [[ "$?" -ne 0 ]]; then
+ print_mieru_client_log
+ sleep 1
+ print_mieru_client_metrics
+ sleep 1
+ print_mieru_server_metrics
+ exit 1
+fi
# Stop mieru client.
./mieru stop
diff --git a/mieru/test/deploy/externalconnect/test_udp.sh b/mieru/test/deploy/externalconnect/test_udp.sh
index dbdff78028..741fe8a345 100755
--- a/mieru/test/deploy/externalconnect/test_udp.sh
+++ b/mieru/test/deploy/externalconnect/test_udp.sh
@@ -58,6 +58,14 @@ fi
# Start testing.
sleep 2
run_external_connect_test
+if [[ "$?" -ne 0 ]]; then
+ print_mieru_client_log
+ sleep 1
+ print_mieru_client_metrics
+ sleep 1
+ print_mieru_server_metrics
+ exit 1
+fi
# Stop mieru client.
./mieru stop
diff --git a/mieru/test/deploy/httptest/libtest.sh b/mieru/test/deploy/httptest/libtest.sh
index 3a84e7497c..260d55e307 100755
--- a/mieru/test/deploy/httptest/libtest.sh
+++ b/mieru/test/deploy/httptest/libtest.sh
@@ -25,14 +25,28 @@ function delete_mieru_client_log() {
rm -rf $HOME/.cache/mieru/*.log
}
+function print_mieru_client_thread_dump() {
+ echo "========== BEGIN OF MIERU CLIENT THREAD DUMP =========="
+ ./mieru get thread-dump
+ echo "========== END OF MIERU CLIENT THREAD DUMP =========="
+}
+
function print_mieru_server_thread_dump() {
echo "========== BEGIN OF MIERU SERVER THREAD DUMP =========="
./mita get thread-dump
echo "========== END OF MIERU SERVER THREAD DUMP =========="
}
-function print_mieru_client_thread_dump() {
- echo "========== BEGIN OF MIERU CLIENT THREAD DUMP =========="
- ./mieru get thread-dump
- echo "========== END OF MIERU CLIENT THREAD DUMP =========="
+function print_mieru_client_metrics() {
+ echo "========== BEGIN OF MIERU CLIENT METRICS =========="
+ ./mieru get metrics
+ ./mieru get memory-statistics
+ echo "========== END OF MIERU CLIENT METRICS =========="
+}
+
+function print_mieru_server_metrics() {
+ echo "========== BEGIN OF MIERU SERVER METRICS =========="
+ ./mita get metrics
+ ./mita get memory-statistics
+ echo "========== END OF MIERU SERVER METRICS =========="
}
diff --git a/mieru/test/deploy/httptest/test_mix_udp_associate.sh b/mieru/test/deploy/httptest/test_mix_udp_associate.sh
index d0ad7150a9..d0f870b38b 100755
--- a/mieru/test/deploy/httptest/test_mix_udp_associate.sh
+++ b/mieru/test/deploy/httptest/test_mix_udp_associate.sh
@@ -77,17 +77,9 @@ fi
./mita get heap-profile /test/mita.associate.heap.gz
# Print metrics and memory statistics.
-echo "client metrics"
-./mieru get metrics
+print_mieru_client_metrics
sleep 1
-echo "server metrics"
-./mita get metrics
-sleep 1
-echo "client memory statistics"
-./mieru get memory-statistics
-sleep 1
-echo "server memory statistics"
-./mita get memory-statistics
+print_mieru_server_metrics
sleep 1
# Stop mieru client.
diff --git a/mieru/test/deploy/httptest/test_tcp.sh b/mieru/test/deploy/httptest/test_tcp.sh
index 04538a57a2..6a40f66da4 100755
--- a/mieru/test/deploy/httptest/test_tcp.sh
+++ b/mieru/test/deploy/httptest/test_tcp.sh
@@ -101,12 +101,10 @@ fi
./mieru get heap-profile /test/mieru.tcp.heap.gz
./mita get heap-profile /test/mita.tcp.heap.gz
-# Print memory statistics.
-echo "client memory statistics"
-./mieru get memory-statistics
+# Print metrics and memory statistics.
+print_mieru_client_metrics
sleep 1
-echo "server memory statistics"
-./mita get memory-statistics
+print_mieru_server_metrics
sleep 1
# Stop mieru client.
diff --git a/mieru/test/deploy/httptest/test_udp.sh b/mieru/test/deploy/httptest/test_udp.sh
index 732f98068f..c7b472f069 100755
--- a/mieru/test/deploy/httptest/test_udp.sh
+++ b/mieru/test/deploy/httptest/test_udp.sh
@@ -101,12 +101,10 @@ fi
./mieru get heap-profile /test/mieru.udp.heap.gz
./mita get heap-profile /test/mita.udp.heap.gz
-# Print memory statistics.
-echo "client memory statistics"
-./mieru get memory-statistics
+# Print metrics and memory statistics.
+print_mieru_client_metrics
sleep 1
-echo "server memory statistics"
-./mita get memory-statistics
+print_mieru_server_metrics
sleep 1
# Stop mieru client.
diff --git a/mieru/tools/gen_users.py b/mieru/tools/gen_users.py
index 08289238c7..8299d4bf12 100755
--- a/mieru/tools/gen_users.py
+++ b/mieru/tools/gen_users.py
@@ -16,7 +16,7 @@
# along with this program. If not, see .
'''
-This program generates users that can be used in mieru server configurations.
+This program generates users that can be used in mita server configurations.
'''
diff --git a/mihomo/component/process/process_linux.go b/mihomo/component/process/process_linux.go
index f817449554..4667104cc2 100644
--- a/mihomo/component/process/process_linux.go
+++ b/mihomo/component/process/process_linux.go
@@ -2,19 +2,23 @@ package process
import (
"bytes"
+ "context"
"encoding/binary"
"fmt"
"net/netip"
"os"
- "path"
"path/filepath"
"runtime"
"strings"
+ "sync"
"syscall"
"unicode"
"unsafe"
+ "github.com/metacubex/mihomo/log"
+
"github.com/mdlayher/netlink"
+ tun "github.com/metacubex/sing-tun"
"golang.org/x/sys/unix"
)
@@ -59,6 +63,19 @@ type inetDiagResponse struct {
INode uint32
}
+type MyCallback struct{}
+
+var (
+ packageManager tun.PackageManager
+ once sync.Once
+)
+
+func (cb *MyCallback) OnPackagesUpdated(packageCount int, sharedCount int) {}
+
+func (cb *MyCallback) NewError(ctx context.Context, err error) {
+ log.Warnln("%s", err)
+}
+
func findProcessName(network string, ip netip.Addr, srcPort int) (uint32, string, error) {
uid, inode, err := resolveSocketByNetlink(network, ip, srcPort)
if err != nil {
@@ -162,12 +179,7 @@ func resolveProcessNameByProcSearch(inode, uid uint32) (string, error) {
}
if runtime.GOOS == "android" {
if bytes.Equal(buffer[:n], socket) {
- cmdline, err := os.ReadFile(path.Join(processPath, "cmdline"))
- if err != nil {
- return "", err
- }
-
- return splitCmdline(cmdline), nil
+ return findPackageName(uid), nil
}
} else {
if bytes.Equal(buffer[:n], socket) {
@@ -181,17 +193,29 @@ func resolveProcessNameByProcSearch(inode, uid uint32) (string, error) {
return "", fmt.Errorf("process of uid(%d),inode(%d) not found", uid, inode)
}
-func splitCmdline(cmdline []byte) string {
- cmdline = bytes.Trim(cmdline, " ")
-
- idx := bytes.IndexFunc(cmdline, func(r rune) bool {
- return unicode.IsControl(r) || unicode.IsSpace(r) || r == ':'
+func findPackageName(uid uint32) string {
+ once.Do(func() {
+ callback := &MyCallback{}
+ var err error
+ packageManager, err = tun.NewPackageManager(callback)
+ if err != nil {
+ log.Warnln("%s", err)
+ }
+ err = packageManager.Start()
+ if err != nil {
+ log.Warnln("%s", err)
+ return
+ }
})
- if idx == -1 {
- return filepath.Base(string(cmdline))
+ if sharedPackage, loaded := packageManager.SharedPackageByID(uid % 100000); loaded {
+ fmt.Println(loaded)
+ return sharedPackage
}
- return filepath.Base(string(cmdline[:idx]))
+ if packageName, loaded := packageManager.PackageByID(uid % 100000); loaded {
+ return packageName
+ }
+ return ""
}
func isPid(s string) bool {
diff --git a/mihomo/listener/sing_tun/server.go b/mihomo/listener/sing_tun/server.go
index 09bf308c73..a5edb77f63 100644
--- a/mihomo/listener/sing_tun/server.go
+++ b/mihomo/listener/sing_tun/server.go
@@ -24,6 +24,7 @@ import (
E "github.com/sagernet/sing/common/exceptions"
F "github.com/sagernet/sing/common/format"
"github.com/sagernet/sing/common/ranges"
+ "golang.org/x/exp/slices"
)
var InterfaceName = "Meta"
@@ -60,19 +61,21 @@ func CalculateInterfaceName(name string) (tunName string) {
return
}
tunIndex := 0
- indexSet := make(map[int]struct{})
+ indexArr := make([]int, 0, len(interfaces))
for _, netInterface := range interfaces {
if strings.HasPrefix(netInterface.Name, tunName) {
index, parseErr := strconv.ParseInt(netInterface.Name[len(tunName):], 10, 16)
if parseErr == nil {
- indexSet[int(index)] = struct{}{}
+ indexArr = append(indexArr, int(index))
}
}
}
- for index := range indexSet {
+ slices.Sort(indexArr)
+ indexArr = slices.Compact(indexArr)
+ for _, index := range indexArr {
if index == tunIndex {
tunIndex += 1
- } else { // indexSet already sorted and distinct, so this tunIndex nobody used
+ } else { // indexArr already sorted and distinct, so this tunIndex nobody used
break
}
}
diff --git a/mihomo/transport/tuic/congestion_v2/bbr_sender.go b/mihomo/transport/tuic/congestion_v2/bbr_sender.go
index ed29bd7e95..d8852fbc96 100644
--- a/mihomo/transport/tuic/congestion_v2/bbr_sender.go
+++ b/mihomo/transport/tuic/congestion_v2/bbr_sender.go
@@ -62,7 +62,7 @@ const (
// Flag.
defaultStartupFullLossCount = 8
quicBbr2DefaultLossThreshold = 0.02
- maxBbrBurstPackets = 3
+ maxBbrBurstPackets = 10
)
type bbrMode int
@@ -334,6 +334,8 @@ func (b *bbrSender) OnPacketSent(
}
b.sampler.OnPacketSent(sentTime, packetNumber, bytes, bytesInFlight, isRetransmittable)
+
+ b.maybeAppLimited(bytesInFlight)
}
// CanSend implements the SendAlgorithm interface.
@@ -413,8 +415,6 @@ func (b *bbrSender) OnCongestionEventEx(priorInFlight congestion.ByteCount, even
// packet in lost_packets.
var lastPacketSendState sendTimeState
- b.maybeApplimited(priorInFlight)
-
// Update bytesInFlight
b.bytesInFlight = priorInFlight
for _, p := range ackedPackets {
@@ -541,7 +541,7 @@ func (b *bbrSender) setDrainGain(drainGain float64) {
b.drainGain = drainGain
}
-// What's the current estimated bandwidth in bytes per second.
+// Get the current bandwidth estimate. Note that Bandwidth is in bits per second.
func (b *bbrSender) bandwidthEstimate() Bandwidth {
return b.maxBandwidth.GetBest()
}
@@ -700,14 +700,13 @@ func (b *bbrSender) checkIfFullBandwidthReached(lastPacketSendState *sendTimeSta
}
}
-func (b *bbrSender) maybeApplimited(bytesInFlight congestion.ByteCount) {
+func (b *bbrSender) maybeAppLimited(bytesInFlight congestion.ByteCount) {
congestionWindow := b.GetCongestionWindow()
if bytesInFlight >= congestionWindow {
return
}
availableBytes := congestionWindow - bytesInFlight
- drainLimited := b.mode == bbrModeDrain && bytesInFlight > congestionWindow/2
- if !drainLimited || availableBytes > maxBbrBurstPackets*b.maxDatagramSize {
+ if availableBytes > maxBbrBurstPackets*b.maxDatagramSize {
b.sampler.OnAppLimited()
}
}
diff --git a/openwrt-packages/adguardhome/Makefile b/openwrt-packages/adguardhome/Makefile
index 1d2ebac15e..eb773a6404 100644
--- a/openwrt-packages/adguardhome/Makefile
+++ b/openwrt-packages/adguardhome/Makefile
@@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=adguardhome
-PKG_VERSION:=0.107.50
+PKG_VERSION:=0.107.51
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/AdGuardHome/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=6c46f69f7fb7556286e579d6472d64435ed2c0920c6a798ac50664dddcc3c5a8
+PKG_HASH:=dea9685282e55940925ff7211f7d72072de5b98134c8f01d5569c04284681650
PKG_LICENSE:=GPL-3.0-only
PKG_LICENSE_FILES:=LICENSE.txt
@@ -57,7 +57,7 @@ define Download/adguardhome-frontend
URL:=https://github.com/AdguardTeam/AdGuardHome/releases/download/v$(PKG_VERSION)/
URL_FILE:=AdGuardHome_frontend.tar.gz
FILE:=$(FRONTEND_FILE)
- HASH:=ad364302567f003072f9fbc78797fba200ef68f9a7291730af777499a6935aa8
+ HASH:=253d05185865840e14e841e4245c3fdb0fdcca28649902303d3869e0bd07cfd7
endef
define Build/Prepare
diff --git a/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
index 89378eec45..ef406ad3ff 100644
--- a/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/openwrt-passwall/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@@ -73,7 +73,7 @@ local doh_validate = function(self, value, t)
for i = 1, #val do
local v = val[i]
if v then
- if not datatypes.ipmask4(v) then
+ if not datatypes.ipmask4(v) and not datatypes.ipmask6(v) then
flag = 1
end
end
diff --git a/ryujinx/Directory.Packages.props b/ryujinx/Directory.Packages.props
index a932475479..c6cc01f9a6 100644
--- a/ryujinx/Directory.Packages.props
+++ b/ryujinx/Directory.Packages.props
@@ -20,7 +20,7 @@
-
+
diff --git a/ryujinx/src/ARMeilleure/CodeGen/Arm64/CodeGenContext.cs b/ryujinx/src/ARMeilleure/CodeGen/Arm64/CodeGenContext.cs
index 12ebabddd5..89b1e9e6bb 100644
--- a/ryujinx/src/ARMeilleure/CodeGen/Arm64/CodeGenContext.cs
+++ b/ryujinx/src/ARMeilleure/CodeGen/Arm64/CodeGenContext.cs
@@ -237,7 +237,7 @@ namespace ARMeilleure.CodeGen.Arm64
long originalPosition = _stream.Position;
_stream.Seek(0, SeekOrigin.Begin);
- _stream.Read(code, 0, code.Length);
+ _stream.ReadExactly(code, 0, code.Length);
_stream.Seek(originalPosition, SeekOrigin.Begin);
RelocInfo relocInfo;
diff --git a/ryujinx/src/ARMeilleure/CodeGen/X86/Assembler.cs b/ryujinx/src/ARMeilleure/CodeGen/X86/Assembler.cs
index 55bf072484..96f4de049c 100644
--- a/ryujinx/src/ARMeilleure/CodeGen/X86/Assembler.cs
+++ b/ryujinx/src/ARMeilleure/CodeGen/X86/Assembler.cs
@@ -1444,7 +1444,7 @@ namespace ARMeilleure.CodeGen.X86
Span buffer = new byte[jump.JumpPosition - _stream.Position];
- _stream.Read(buffer);
+ _stream.ReadExactly(buffer);
_stream.Seek(ReservedBytesForJump, SeekOrigin.Current);
codeStream.Write(buffer);
diff --git a/ryujinx/src/Ryujinx.Common/Memory/MemoryOwner.cs b/ryujinx/src/Ryujinx.Common/Memory/MemoryOwner.cs
new file mode 100644
index 0000000000..5e567ab8d6
--- /dev/null
+++ b/ryujinx/src/Ryujinx.Common/Memory/MemoryOwner.cs
@@ -0,0 +1,140 @@
+#nullable enable
+using System;
+using System.Buffers;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace Ryujinx.Common.Memory
+{
+ ///
+ /// An implementation with an embedded length and fast
+ /// accessor, with memory allocated from .
+ ///
+ /// The type of item to store.
+ public sealed class MemoryOwner : IMemoryOwner
+ {
+ private readonly int _length;
+ private T[]? _array;
+
+ ///
+ /// Initializes a new instance of the class with the specified parameters.
+ ///
+ /// The length of the new memory buffer to use
+ private MemoryOwner(int length)
+ {
+ _length = length;
+ _array = ArrayPool.Shared.Rent(length);
+ }
+
+ ///
+ /// Creates a new instance with the specified length.
+ ///
+ /// The length of the new memory buffer to use
+ /// A instance of the requested length
+ /// Thrown when is not valid
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public static MemoryOwner Rent(int length) => new(length);
+
+ ///
+ /// Creates a new instance with the specified length and the content cleared.
+ ///
+ /// The length of the new memory buffer to use
+ /// A instance of the requested length and the content cleared
+ /// Thrown when is not valid
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public static MemoryOwner RentCleared(int length)
+ {
+ MemoryOwner result = new(length);
+
+ result._array.AsSpan(0, length).Clear();
+
+ return result;
+ }
+
+ ///
+ /// Creates a new instance with the content copied from the specified buffer.
+ ///
+ /// The buffer to copy
+ /// A instance with the same length and content as
+ public static MemoryOwner RentCopy(ReadOnlySpan buffer)
+ {
+ MemoryOwner result = new(buffer.Length);
+
+ buffer.CopyTo(result._array);
+
+ return result;
+ }
+
+ ///
+ /// Gets the number of items in the current instance.
+ ///
+ public int Length
+ {
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ get => _length;
+ }
+
+ ///
+ public Memory Memory
+ {
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ get
+ {
+ T[]? array = _array;
+
+ if (array is null)
+ {
+ ThrowObjectDisposedException();
+ }
+
+ return new(array, 0, _length);
+ }
+ }
+
+ ///
+ /// Gets a wrapping the memory belonging to the current instance.
+ ///
+ ///
+ /// Uses a trick made possible by the .NET 6+ runtime array layout.
+ ///
+ public Span Span
+ {
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ get
+ {
+ T[]? array = _array;
+
+ if (array is null)
+ {
+ ThrowObjectDisposedException();
+ }
+
+ ref T firstElementRef = ref MemoryMarshal.GetArrayDataReference(array);
+
+ return MemoryMarshal.CreateSpan(ref firstElementRef, _length);
+ }
+ }
+
+ ///
+ public void Dispose()
+ {
+ T[]? array = Interlocked.Exchange(ref _array, null);
+
+ if (array is not null)
+ {
+ ArrayPool.Shared.Return(array);
+ }
+ }
+
+ ///
+ /// Throws an when is .
+ ///
+ [DoesNotReturn]
+ private static void ThrowObjectDisposedException()
+ {
+ throw new ObjectDisposedException(nameof(MemoryOwner), "The buffer has already been disposed.");
+ }
+ }
+}
diff --git a/ryujinx/src/Ryujinx.Common/Memory/SpanOwner.cs b/ryujinx/src/Ryujinx.Common/Memory/SpanOwner.cs
new file mode 100644
index 0000000000..a4b4adf32b
--- /dev/null
+++ b/ryujinx/src/Ryujinx.Common/Memory/SpanOwner.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Buffers;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Common.Memory
+{
+ ///
+ /// A stack-only type that rents a buffer of a specified length from .
+ /// It does not implement to avoid being boxed, but should still be disposed. This
+ /// is easy since C# 8, which allows use of C# `using` constructs on any type that has a public Dispose() method.
+ /// To keep this type simple, fast, and read-only, it does not check or guard against multiple disposals.
+ /// For all these reasons, all usage should be with a `using` block or statement.
+ ///
+ /// The type of item to store.
+ public readonly ref struct SpanOwner
+ {
+ private readonly int _length;
+ private readonly T[] _array;
+
+ ///
+ /// Initializes a new instance of the struct with the specified parameters.
+ ///
+ /// The length of the new memory buffer to use
+ private SpanOwner(int length)
+ {
+ _length = length;
+ _array = ArrayPool.Shared.Rent(length);
+ }
+
+ ///
+ /// Gets an empty instance.
+ ///
+ public static SpanOwner Empty
+ {
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ get => new(0);
+ }
+
+ ///
+ /// Creates a new instance with the specified length.
+ ///
+ /// The length of the new memory buffer to use
+ /// A instance of the requested length
+ /// Thrown when is not valid
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public static SpanOwner Rent(int length) => new(length);
+
+ ///
+ /// Creates a new instance with the length and the content cleared.
+ ///
+ /// The length of the new memory buffer to use
+ /// A instance of the requested length and the content cleared
+ /// Thrown when is not valid
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public static SpanOwner RentCleared(int length)
+ {
+ SpanOwner result = new(length);
+
+ result._array.AsSpan(0, length).Clear();
+
+ return result;
+ }
+
+ ///
+ /// Creates a new instance with the content copied from the specified buffer.
+ ///
+ /// The buffer to copy
+ /// A instance with the same length and content as
+ public static SpanOwner RentCopy(ReadOnlySpan buffer)
+ {
+ SpanOwner result = new(buffer.Length);
+
+ buffer.CopyTo(result._array);
+
+ return result;
+ }
+
+ ///
+ /// Gets the number of items in the current instance
+ ///
+ public int Length
+ {
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ get => _length;
+ }
+
+ ///
+ /// Gets a wrapping the memory belonging to the current instance.
+ ///
+ ///
+ /// Uses a trick made possible by the .NET 6+ runtime array layout.
+ ///
+ public Span Span
+ {
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ get
+ {
+ ref T firstElementRef = ref MemoryMarshal.GetArrayDataReference(_array);
+
+ return MemoryMarshal.CreateSpan(ref firstElementRef, _length);
+ }
+ }
+
+ ///
+ /// Implements the duck-typed method.
+ ///
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public void Dispose()
+ {
+ ArrayPool.Shared.Return(_array);
+ }
+ }
+}
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/IImageArray.cs b/ryujinx/src/Ryujinx.Graphics.GAL/IImageArray.cs
index 30cff50b15..d119aa9fbd 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/IImageArray.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/IImageArray.cs
@@ -1,6 +1,8 @@
+using System;
+
namespace Ryujinx.Graphics.GAL
{
- public interface IImageArray
+ public interface IImageArray : IDisposable
{
void SetFormats(int index, Format[] imageFormats);
void SetImages(int index, ITexture[] images);
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/ITextureArray.cs b/ryujinx/src/Ryujinx.Graphics.GAL/ITextureArray.cs
index 35c2116b54..9ee79dacbb 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/ITextureArray.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/ITextureArray.cs
@@ -1,6 +1,8 @@
+using System;
+
namespace Ryujinx.Graphics.GAL
{
- public interface ITextureArray
+ public interface ITextureArray : IDisposable
{
void SetSamplers(int index, ISampler[] samplers);
void SetTextures(int index, ITexture[] textures);
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/CommandHelper.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/CommandHelper.cs
index edaae3042d..ef227d4a54 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/CommandHelper.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/CommandHelper.cs
@@ -66,6 +66,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
Register(CommandType.CounterEventDispose);
Register(CommandType.CounterEventFlush);
+ Register(CommandType.ImageArrayDispose);
Register(CommandType.ImageArraySetFormats);
Register(CommandType.ImageArraySetImages);
@@ -88,6 +89,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
Register(CommandType.TextureSetDataSliceRegion);
Register(CommandType.TextureSetStorage);
+ Register(CommandType.TextureArrayDispose);
Register(CommandType.TextureArraySetSamplers);
Register(CommandType.TextureArraySetTextures);
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/CommandType.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/CommandType.cs
index 7586953526..cf3f5d6c14 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/CommandType.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/CommandType.cs
@@ -26,6 +26,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
CounterEventDispose,
CounterEventFlush,
+ ImageArrayDispose,
ImageArraySetFormats,
ImageArraySetImages,
@@ -48,6 +49,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
TextureSetDataSliceRegion,
TextureSetStorage,
+ TextureArrayDispose,
TextureArraySetSamplers,
TextureArraySetTextures,
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/ImageArray/ImageArrayDisposeCommand.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/ImageArray/ImageArrayDisposeCommand.cs
new file mode 100644
index 0000000000..ac2ac933b7
--- /dev/null
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/ImageArray/ImageArrayDisposeCommand.cs
@@ -0,0 +1,21 @@
+using Ryujinx.Graphics.GAL.Multithreading.Model;
+using Ryujinx.Graphics.GAL.Multithreading.Resources;
+
+namespace Ryujinx.Graphics.GAL.Multithreading.Commands.ImageArray
+{
+ struct ImageArrayDisposeCommand : IGALCommand, IGALCommand
+ {
+ public readonly CommandType CommandType => CommandType.ImageArrayDispose;
+ private TableRef _imageArray;
+
+ public void Set(TableRef imageArray)
+ {
+ _imageArray = imageArray;
+ }
+
+ public static void Run(ref ImageArrayDisposeCommand command, ThreadedRenderer threaded, IRenderer renderer)
+ {
+ command._imageArray.Get(threaded).Base.Dispose();
+ }
+ }
+}
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureArray/TextureArrayDisposeCommand.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureArray/TextureArrayDisposeCommand.cs
new file mode 100644
index 0000000000..fec1c48f0d
--- /dev/null
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureArray/TextureArrayDisposeCommand.cs
@@ -0,0 +1,21 @@
+using Ryujinx.Graphics.GAL.Multithreading.Model;
+using Ryujinx.Graphics.GAL.Multithreading.Resources;
+
+namespace Ryujinx.Graphics.GAL.Multithreading.Commands.TextureArray
+{
+ struct TextureArrayDisposeCommand : IGALCommand, IGALCommand
+ {
+ public readonly CommandType CommandType => CommandType.TextureArrayDispose;
+ private TableRef _textureArray;
+
+ public void Set(TableRef textureArray)
+ {
+ _textureArray = textureArray;
+ }
+
+ public static void Run(ref TextureArrayDisposeCommand command, ThreadedRenderer threaded, IRenderer renderer)
+ {
+ command._textureArray.Get(threaded).Base.Dispose();
+ }
+ }
+}
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureAndSamplerArray/TextureArraySetSamplersCommand.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureArray/TextureArraySetSamplersCommand.cs
similarity index 100%
rename from ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureAndSamplerArray/TextureArraySetSamplersCommand.cs
rename to ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureArray/TextureArraySetSamplersCommand.cs
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureAndSamplerArray/TextureArraySetTexturesCommand.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureArray/TextureArraySetTexturesCommand.cs
similarity index 100%
rename from ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureAndSamplerArray/TextureArraySetTexturesCommand.cs
rename to ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Commands/TextureArray/TextureArraySetTexturesCommand.cs
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedImageArray.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedImageArray.cs
index d26ee1fbd5..19bc6f233a 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedImageArray.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedImageArray.cs
@@ -21,6 +21,12 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
return new TableRef(_renderer, reference);
}
+ public void Dispose()
+ {
+ _renderer.New().Set(Ref(this));
+ _renderer.QueueCommand();
+ }
+
public void SetFormats(int index, Format[] imageFormats)
{
_renderer.New().Set(Ref(this), index, Ref(imageFormats));
diff --git a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTextureArray.cs b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTextureArray.cs
index 82405a1f69..4334c70484 100644
--- a/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTextureArray.cs
+++ b/ryujinx/src/Ryujinx.Graphics.GAL/Multithreading/Resources/ThreadedTextureArray.cs
@@ -22,6 +22,12 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Resources
return new TableRef(_renderer, reference);
}
+ public void Dispose()
+ {
+ _renderer.New().Set(Ref(this));
+ _renderer.QueueCommand();
+ }
+
public void SetSamplers(int index, ISampler[] samplers)
{
_renderer.New().Set(Ref(this), index, Ref(samplers.ToArray()));
diff --git a/ryujinx/src/Ryujinx.Graphics.Gpu/Image/TextureBindingsArrayCache.cs b/ryujinx/src/Ryujinx.Graphics.Gpu/Image/TextureBindingsArrayCache.cs
index 18e28b3dd7..01e34c7771 100644
--- a/ryujinx/src/Ryujinx.Graphics.Gpu/Image/TextureBindingsArrayCache.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Gpu/Image/TextureBindingsArrayCache.cs
@@ -1113,6 +1113,15 @@ namespace Ryujinx.Graphics.Gpu.Image
nextNode = nextNode.Next;
_cacheFromBuffer.Remove(toRemove.Value.Key);
_lruCache.Remove(toRemove);
+
+ if (toRemove.Value.Key.IsImage)
+ {
+ toRemove.Value.ImageArray.Dispose();
+ }
+ else
+ {
+ toRemove.Value.TextureArray.Dispose();
+ }
}
}
@@ -1124,11 +1133,20 @@ namespace Ryujinx.Graphics.Gpu.Image
{
List keysToRemove = null;
- foreach (CacheEntryFromPoolKey key in _cacheFromPool.Keys)
+ foreach ((CacheEntryFromPoolKey key, CacheEntry entry) in _cacheFromPool)
{
if (key.MatchesPool(pool))
{
(keysToRemove ??= new()).Add(key);
+
+ if (key.IsImage)
+ {
+ entry.ImageArray.Dispose();
+ }
+ else
+ {
+ entry.TextureArray.Dispose();
+ }
}
}
diff --git a/ryujinx/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/BinarySerializer.cs b/ryujinx/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/BinarySerializer.cs
index ab4508f6d1..3837092c94 100644
--- a/ryujinx/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/BinarySerializer.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/BinarySerializer.cs
@@ -195,7 +195,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
switch (algorithm)
{
case CompressionAlgorithm.None:
- stream.Read(data);
+ stream.ReadExactly(data);
break;
case CompressionAlgorithm.Deflate:
stream = new DeflateStream(stream, CompressionMode.Decompress, true);
diff --git a/ryujinx/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheGuestStorage.cs b/ryujinx/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheGuestStorage.cs
index 59d2cfb3fe..08cd3bb02e 100644
--- a/ryujinx/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheGuestStorage.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheGuestStorage.cs
@@ -220,7 +220,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
}
dataFileStream.Seek((long)entry.Offset, SeekOrigin.Begin);
- dataFileStream.Read(cb1Data);
+ dataFileStream.ReadExactly(cb1Data);
BinarySerializer.ReadCompressed(dataFileStream, guestCode);
_cache[index] = (guestCode, cb1Data);
@@ -279,7 +279,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
dataFileStream.Seek((long)entry.Offset, SeekOrigin.Begin);
byte[] cachedCode = new byte[entry.CodeSize];
byte[] cachedCb1Data = new byte[entry.Cb1DataSize];
- dataFileStream.Read(cachedCb1Data);
+ dataFileStream.ReadExactly(cachedCb1Data);
BinarySerializer.ReadCompressed(dataFileStream, cachedCode);
if (data.SequenceEqual(cachedCode) && cb1Data.SequenceEqual(cachedCb1Data))
diff --git a/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/ImageArray.cs b/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/ImageArray.cs
index 1c5acedf3a..6198823d9d 100644
--- a/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/ImageArray.cs
+++ b/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/ImageArray.cs
@@ -63,5 +63,9 @@ namespace Ryujinx.Graphics.OpenGL.Image
}
}
}
+
+ public void Dispose()
+ {
+ }
}
}
diff --git a/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureArray.cs b/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureArray.cs
index d70b0a0081..41ac058c1c 100644
--- a/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureArray.cs
+++ b/ryujinx/src/Ryujinx.Graphics.OpenGL/Image/TextureArray.cs
@@ -48,5 +48,9 @@ namespace Ryujinx.Graphics.OpenGL.Image
}
}
}
+
+ public void Dispose()
+ {
+ }
}
}
diff --git a/ryujinx/src/Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs b/ryujinx/src/Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs
index f3be29bb9d..cc7977f848 100644
--- a/ryujinx/src/Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs
@@ -98,11 +98,6 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
Logger = parameters.Logger;
TargetApi = parameters.TargetApi;
- AddCapability(Capability.Shader);
- AddCapability(Capability.Float64);
-
- SetMemoryModel(AddressingModel.Logical, MemoryModel.GLSL450);
-
Delegates = new SpirvDelegates(this);
}
diff --git a/ryujinx/src/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvGenerator.cs b/ryujinx/src/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvGenerator.cs
index ccfdc46d09..b259dde28c 100644
--- a/ryujinx/src/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvGenerator.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvGenerator.cs
@@ -43,6 +43,10 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
CodeGenContext context = new(info, parameters, instPool, integerPool);
+ context.AddCapability(Capability.Shader);
+
+ context.SetMemoryModel(AddressingModel.Logical, MemoryModel.GLSL450);
+
context.AddCapability(Capability.GroupNonUniformBallot);
context.AddCapability(Capability.GroupNonUniformShuffle);
context.AddCapability(Capability.GroupNonUniformVote);
@@ -51,6 +55,11 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
context.AddCapability(Capability.ImageQuery);
context.AddCapability(Capability.SampledBuffer);
+ if (parameters.HostCapabilities.SupportsShaderFloat64)
+ {
+ context.AddCapability(Capability.Float64);
+ }
+
if (parameters.Definitions.TransformFeedbackEnabled && parameters.Definitions.LastInVertexPipeline)
{
context.AddCapability(Capability.TransformFeedback);
@@ -58,7 +67,8 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
if (parameters.Definitions.Stage == ShaderStage.Fragment)
{
- if (context.Info.IoDefinitions.Contains(new IoDefinition(StorageKind.Input, IoVariable.Layer)))
+ if (context.Info.IoDefinitions.Contains(new IoDefinition(StorageKind.Input, IoVariable.Layer)) ||
+ context.Info.IoDefinitions.Contains(new IoDefinition(StorageKind.Input, IoVariable.PrimitiveId)))
{
context.AddCapability(Capability.Geometry);
}
diff --git a/ryujinx/src/Ryujinx.Graphics.Shader/Translation/HostCapabilities.cs b/ryujinx/src/Ryujinx.Graphics.Shader/Translation/HostCapabilities.cs
index 2523272b0c..11fe6599db 100644
--- a/ryujinx/src/Ryujinx.Graphics.Shader/Translation/HostCapabilities.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Shader/Translation/HostCapabilities.cs
@@ -8,6 +8,7 @@ namespace Ryujinx.Graphics.Shader.Translation
public readonly bool SupportsGeometryShaderPassthrough;
public readonly bool SupportsShaderBallot;
public readonly bool SupportsShaderBarrierDivergence;
+ public readonly bool SupportsShaderFloat64;
public readonly bool SupportsTextureShadowLod;
public readonly bool SupportsViewportMask;
@@ -18,6 +19,7 @@ namespace Ryujinx.Graphics.Shader.Translation
bool supportsGeometryShaderPassthrough,
bool supportsShaderBallot,
bool supportsShaderBarrierDivergence,
+ bool supportsShaderFloat64,
bool supportsTextureShadowLod,
bool supportsViewportMask)
{
@@ -27,6 +29,7 @@ namespace Ryujinx.Graphics.Shader.Translation
SupportsGeometryShaderPassthrough = supportsGeometryShaderPassthrough;
SupportsShaderBallot = supportsShaderBallot;
SupportsShaderBarrierDivergence = supportsShaderBarrierDivergence;
+ SupportsShaderFloat64 = supportsShaderFloat64;
SupportsTextureShadowLod = supportsTextureShadowLod;
SupportsViewportMask = supportsViewportMask;
}
diff --git a/ryujinx/src/Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs b/ryujinx/src/Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs
index 59914736ee..a579433f92 100644
--- a/ryujinx/src/Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs
@@ -363,6 +363,7 @@ namespace Ryujinx.Graphics.Shader.Translation
GpuAccessor.QueryHostSupportsGeometryShaderPassthrough(),
GpuAccessor.QueryHostSupportsShaderBallot(),
GpuAccessor.QueryHostSupportsShaderBarrierDivergence(),
+ GpuAccessor.QueryHostSupportsShaderFloat64(),
GpuAccessor.QueryHostSupportsTextureShadowLod(),
GpuAccessor.QueryHostSupportsViewportMask());
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
index 382f88d053..3590d5d057 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
@@ -291,8 +291,9 @@ namespace Ryujinx.Graphics.Vulkan
}
else
{
- PipelineStageFlags stageFlags = _textureArrayRefs[segment.Binding].Stage.ConvertToPipelineStageFlags();
- _textureArrayRefs[segment.Binding].Array?.QueueWriteToReadBarriers(cbs, stageFlags);
+ ref var arrayRef = ref _textureArrayRefs[segment.Binding];
+ PipelineStageFlags stageFlags = arrayRef.Stage.ConvertToPipelineStageFlags();
+ arrayRef.Array?.QueueWriteToReadBarriers(cbs, stageFlags);
}
}
}
@@ -311,8 +312,40 @@ namespace Ryujinx.Graphics.Vulkan
}
else
{
- PipelineStageFlags stageFlags = _imageArrayRefs[segment.Binding].Stage.ConvertToPipelineStageFlags();
- _imageArrayRefs[segment.Binding].Array?.QueueWriteToReadBarriers(cbs, stageFlags);
+ ref var arrayRef = ref _imageArrayRefs[segment.Binding];
+ PipelineStageFlags stageFlags = arrayRef.Stage.ConvertToPipelineStageFlags();
+ arrayRef.Array?.QueueWriteToReadBarriers(cbs, stageFlags);
+ }
+ }
+ }
+
+ for (int setIndex = PipelineBase.DescriptorSetLayouts; setIndex < _program.BindingSegments.Length; setIndex++)
+ {
+ var bindingSegments = _program.BindingSegments[setIndex];
+
+ if (bindingSegments.Length == 0)
+ {
+ continue;
+ }
+
+ ResourceBindingSegment segment = bindingSegments[0];
+
+ if (segment.IsArray)
+ {
+ if (segment.Type == ResourceType.Texture ||
+ segment.Type == ResourceType.Sampler ||
+ segment.Type == ResourceType.TextureAndSampler ||
+ segment.Type == ResourceType.BufferTexture)
+ {
+ ref var arrayRef = ref _textureArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts];
+ PipelineStageFlags stageFlags = arrayRef.Stage.ConvertToPipelineStageFlags();
+ arrayRef.Array?.QueueWriteToReadBarriers(cbs, stageFlags);
+ }
+ else if (segment.Type == ResourceType.Image || segment.Type == ResourceType.BufferImage)
+ {
+ ref var arrayRef = ref _imageArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts];
+ PipelineStageFlags stageFlags = arrayRef.Stage.ConvertToPipelineStageFlags();
+ arrayRef.Array?.QueueWriteToReadBarriers(cbs, stageFlags);
}
}
}
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/ImageArray.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/ImageArray.cs
index 3c7f321ff7..e42750d3ce 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/ImageArray.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/ImageArray.cs
@@ -2,11 +2,10 @@ using Ryujinx.Graphics.GAL;
using Silk.NET.Vulkan;
using System;
using System.Collections.Generic;
-using System.Diagnostics;
namespace Ryujinx.Graphics.Vulkan
{
- class ImageArray : IImageArray
+ class ImageArray : ResourceArray, IImageArray
{
private readonly VulkanRenderer _gd;
@@ -25,19 +24,11 @@ namespace Ryujinx.Graphics.Vulkan
private HashSet _storages;
- private DescriptorSet[] _cachedDescriptorSets;
-
private int _cachedCommandBufferIndex;
private int _cachedSubmissionCount;
- private ShaderCollection _cachedDscProgram;
- private int _cachedDscSetIndex;
- private int _cachedDscIndex;
-
private readonly bool _isBuffer;
- private int _bindCount;
-
public ImageArray(VulkanRenderer gd, int size, bool isBuffer)
{
_gd = gd;
@@ -104,12 +95,7 @@ namespace Ryujinx.Graphics.Vulkan
{
_cachedCommandBufferIndex = -1;
_storages = null;
- _cachedDescriptorSets = null;
-
- if (_bindCount != 0)
- {
- _gd.PipelineInternal.ForceImageDirty();
- }
+ SetDirty(_gd);
}
public void QueueWriteToReadBarriers(CommandBufferScoped cbs, PipelineStageFlags stageFlags)
@@ -195,7 +181,7 @@ namespace Ryujinx.Graphics.Vulkan
int setIndex,
TextureView dummyTexture)
{
- if (_cachedDescriptorSets != null)
+ if (TryGetCachedDescriptorSets(cbs, program, setIndex, out DescriptorSet[] sets))
{
// We still need to ensure the current command buffer holds a reference to all used textures.
@@ -208,12 +194,9 @@ namespace Ryujinx.Graphics.Vulkan
GetBufferViews(cbs);
}
- return _cachedDescriptorSets;
+ return sets;
}
- _cachedDscProgram?.ReleaseManualDescriptorSetCollection(_cachedDscSetIndex, _cachedDscIndex);
- var dsc = program.GetNewManualDescriptorSetCollection(cbs.CommandBufferIndex, setIndex, out _cachedDscIndex).Get(cbs);
-
DescriptorSetTemplate template = program.Templates[setIndex];
DescriptorSetTemplateWriter tu = templateUpdater.Begin(template);
@@ -227,24 +210,9 @@ namespace Ryujinx.Graphics.Vulkan
tu.Push(GetBufferViews(cbs));
}
- var sets = dsc.GetSets();
templateUpdater.Commit(_gd, device, sets[0]);
- _cachedDescriptorSets = sets;
- _cachedDscProgram = program;
- _cachedDscSetIndex = setIndex;
return sets;
}
-
- public void IncrementBindCount()
- {
- _bindCount++;
- }
-
- public void DecrementBindCount()
- {
- int newBindCount = --_bindCount;
- Debug.Assert(newBindCount >= 0);
- }
}
}
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/MultiFenceHolder.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/MultiFenceHolder.cs
index 0bce3b72df..806b872bc2 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/MultiFenceHolder.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/MultiFenceHolder.cs
@@ -1,3 +1,4 @@
+using Ryujinx.Common.Memory;
using Silk.NET.Vulkan;
using System;
@@ -165,14 +166,15 @@ namespace Ryujinx.Graphics.Vulkan
/// True if all fences were signaled before the timeout expired, false otherwise
private bool WaitForFencesImpl(Vk api, Device device, int offset, int size, bool hasTimeout, ulong timeout)
{
- Span fenceHolders = new FenceHolder[CommandBufferPool.MaxCommandBuffers];
+ using SpanOwner fenceHoldersOwner = SpanOwner.Rent(CommandBufferPool.MaxCommandBuffers);
+ Span fenceHolders = fenceHoldersOwner.Span;
int count = size != 0 ? GetOverlappingFences(fenceHolders, offset, size) : GetFences(fenceHolders);
Span fences = stackalloc Fence[count];
int fenceCount = 0;
- for (int i = 0; i < count; i++)
+ for (int i = 0; i < fences.Length; i++)
{
if (fenceHolders[i].TryGet(out Fence fence))
{
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs
index 41618c736e..7d124c830a 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs
@@ -180,9 +180,6 @@ namespace Ryujinx.Graphics.Vulkan
pipeline.LogicOpEnable = state.LogicOpEnable;
pipeline.LogicOp = state.LogicOp.Convert();
- pipeline.MinDepthBounds = 0f; // Not implemented.
- pipeline.MaxDepthBounds = 0f; // Not implemented.
-
pipeline.PatchControlPoints = state.PatchControlPoints;
pipeline.PolygonMode = PolygonMode.Fill; // Not implemented.
pipeline.PrimitiveRestartEnable = state.PrimitiveRestartEnable;
@@ -208,17 +205,11 @@ namespace Ryujinx.Graphics.Vulkan
pipeline.StencilFrontPassOp = state.StencilTest.FrontDpPass.Convert();
pipeline.StencilFrontDepthFailOp = state.StencilTest.FrontDpFail.Convert();
pipeline.StencilFrontCompareOp = state.StencilTest.FrontFunc.Convert();
- pipeline.StencilFrontCompareMask = 0;
- pipeline.StencilFrontWriteMask = 0;
- pipeline.StencilFrontReference = 0;
pipeline.StencilBackFailOp = state.StencilTest.BackSFail.Convert();
pipeline.StencilBackPassOp = state.StencilTest.BackDpPass.Convert();
pipeline.StencilBackDepthFailOp = state.StencilTest.BackDpFail.Convert();
pipeline.StencilBackCompareOp = state.StencilTest.BackFunc.Convert();
- pipeline.StencilBackCompareMask = 0;
- pipeline.StencilBackWriteMask = 0;
- pipeline.StencilBackReference = 0;
pipeline.StencilTestEnable = state.StencilTest.TestEnable;
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineLayoutCacheEntry.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineLayoutCacheEntry.cs
index 7d0948d6e6..ae296b033f 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineLayoutCacheEntry.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineLayoutCacheEntry.cs
@@ -3,6 +3,7 @@ using Silk.NET.Vulkan;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.Diagnostics;
using System.Runtime.InteropServices;
namespace Ryujinx.Graphics.Vulkan
@@ -15,6 +16,7 @@ namespace Ryujinx.Graphics.Vulkan
private readonly Device _device;
public DescriptorSetLayout[] DescriptorSetLayouts { get; }
+ public bool[] DescriptorSetLayoutsUpdateAfterBind { get; }
public PipelineLayout PipelineLayout { get; }
private readonly int[] _consumedDescriptorsPerSet;
@@ -31,20 +33,37 @@ namespace Ryujinx.Graphics.Vulkan
private struct ManualDescriptorSetEntry
{
public Auto DescriptorSet;
- public int CbIndex;
- public int CbSubmissionCount;
+ public uint CbRefMask;
public bool InUse;
- public ManualDescriptorSetEntry(Auto descriptorSet, int cbIndex, int cbSubmissionCount, bool inUse)
+ public ManualDescriptorSetEntry(Auto descriptorSet, int cbIndex)
{
DescriptorSet = descriptorSet;
- CbIndex = cbIndex;
- CbSubmissionCount = cbSubmissionCount;
- InUse = inUse;
+ CbRefMask = 1u << cbIndex;
+ InUse = true;
+ }
+ }
+
+ private readonly struct PendingManualDsConsumption
+ {
+ public FenceHolder Fence { get; }
+ public int CommandBufferIndex { get; }
+ public int SetIndex { get; }
+ public int CacheIndex { get; }
+
+ public PendingManualDsConsumption(FenceHolder fence, int commandBufferIndex, int setIndex, int cacheIndex)
+ {
+ Fence = fence;
+ CommandBufferIndex = commandBufferIndex;
+ SetIndex = setIndex;
+ CacheIndex = cacheIndex;
+ fence.Get();
}
}
private readonly List[] _manualDsCache;
+ private readonly Queue _pendingManualDsConsumptions;
+ private readonly Queue[] _freeManualDsCacheEntries;
private readonly Dictionary _pdTemplates;
private readonly ResourceDescriptorCollection _pdDescriptors;
@@ -70,6 +89,8 @@ namespace Ryujinx.Graphics.Vulkan
_dsCacheCursor = new int[setsCount];
_manualDsCache = new List[setsCount];
+ _pendingManualDsConsumptions = new Queue();
+ _freeManualDsCacheEntries = new Queue[setsCount];
}
public PipelineLayoutCacheEntry(
@@ -78,7 +99,11 @@ namespace Ryujinx.Graphics.Vulkan
ReadOnlyCollection setDescriptors,
bool usePushDescriptors) : this(gd, device, setDescriptors.Count)
{
- (DescriptorSetLayouts, PipelineLayout) = PipelineLayoutFactory.Create(gd, device, setDescriptors, usePushDescriptors);
+ ResourceLayouts layouts = PipelineLayoutFactory.Create(gd, device, setDescriptors, usePushDescriptors);
+
+ DescriptorSetLayouts = layouts.DescriptorSetLayouts;
+ DescriptorSetLayoutsUpdateAfterBind = layouts.DescriptorSetLayoutsUpdateAfterBind;
+ PipelineLayout = layouts.PipelineLayout;
_consumedDescriptorsPerSet = new int[setDescriptors.Count];
_poolSizes = new DescriptorPoolSize[setDescriptors.Count][];
@@ -133,7 +158,7 @@ namespace Ryujinx.Graphics.Vulkan
_poolSizes[setIndex],
setIndex,
_consumedDescriptorsPerSet[setIndex],
- false);
+ DescriptorSetLayoutsUpdateAfterBind[setIndex]);
list.Add(dsc);
isNew = true;
@@ -144,49 +169,99 @@ namespace Ryujinx.Graphics.Vulkan
return list[index];
}
- public Auto GetNewManualDescriptorSetCollection(int commandBufferIndex, int setIndex, out int cacheIndex)
+ public Auto GetNewManualDescriptorSetCollection(CommandBufferScoped cbs, int setIndex, out int cacheIndex)
{
- int submissionCount = _gd.CommandBufferPool.GetSubmissionCount(commandBufferIndex);
+ FreeCompletedManualDescriptorSets();
var list = _manualDsCache[setIndex] ??= new();
var span = CollectionsMarshal.AsSpan(list);
- for (int index = 0; index < span.Length; index++)
+ Queue freeQueue = _freeManualDsCacheEntries[setIndex];
+
+ // Do we have at least one freed descriptor set? If so, just use that.
+ if (freeQueue != null && freeQueue.TryDequeue(out int freeIndex))
{
- ref ManualDescriptorSetEntry entry = ref span[index];
+ ref ManualDescriptorSetEntry entry = ref span[freeIndex];
- if (!entry.InUse && (entry.CbIndex != commandBufferIndex || entry.CbSubmissionCount != submissionCount))
- {
- entry.InUse = true;
- entry.CbIndex = commandBufferIndex;
- entry.CbSubmissionCount = submissionCount;
+ Debug.Assert(!entry.InUse && entry.CbRefMask == 0);
- cacheIndex = index;
+ entry.InUse = true;
+ entry.CbRefMask = 1u << cbs.CommandBufferIndex;
+ cacheIndex = freeIndex;
- return entry.DescriptorSet;
- }
+ _pendingManualDsConsumptions.Enqueue(new PendingManualDsConsumption(cbs.GetFence(), cbs.CommandBufferIndex, setIndex, freeIndex));
+
+ return entry.DescriptorSet;
}
+ // Otherwise create a new descriptor set, and add to our pending queue for command buffer consumption tracking.
var dsc = _descriptorSetManager.AllocateDescriptorSet(
_gd.Api,
DescriptorSetLayouts[setIndex],
_poolSizes[setIndex],
setIndex,
_consumedDescriptorsPerSet[setIndex],
- false);
+ DescriptorSetLayoutsUpdateAfterBind[setIndex]);
cacheIndex = list.Count;
- list.Add(new ManualDescriptorSetEntry(dsc, commandBufferIndex, submissionCount, inUse: true));
+ list.Add(new ManualDescriptorSetEntry(dsc, cbs.CommandBufferIndex));
+ _pendingManualDsConsumptions.Enqueue(new PendingManualDsConsumption(cbs.GetFence(), cbs.CommandBufferIndex, setIndex, cacheIndex));
return dsc;
}
+ public void UpdateManualDescriptorSetCollectionOwnership(CommandBufferScoped cbs, int setIndex, int cacheIndex)
+ {
+ FreeCompletedManualDescriptorSets();
+
+ var list = _manualDsCache[setIndex];
+ var span = CollectionsMarshal.AsSpan(list);
+ ref var entry = ref span[cacheIndex];
+
+ uint cbMask = 1u << cbs.CommandBufferIndex;
+
+ if ((entry.CbRefMask & cbMask) == 0)
+ {
+ entry.CbRefMask |= cbMask;
+
+ _pendingManualDsConsumptions.Enqueue(new PendingManualDsConsumption(cbs.GetFence(), cbs.CommandBufferIndex, setIndex, cacheIndex));
+ }
+ }
+
+ private void FreeCompletedManualDescriptorSets()
+ {
+ FenceHolder signalledFence = null;
+ while (_pendingManualDsConsumptions.TryPeek(out var pds) && (pds.Fence == signalledFence || pds.Fence.IsSignaled()))
+ {
+ signalledFence = pds.Fence; // Already checked - don't need to do it again.
+ var dequeued = _pendingManualDsConsumptions.Dequeue();
+ Debug.Assert(dequeued.Fence == pds.Fence);
+ pds.Fence.Put();
+
+ var span = CollectionsMarshal.AsSpan(_manualDsCache[dequeued.SetIndex]);
+ ref var entry = ref span[dequeued.CacheIndex];
+ entry.CbRefMask &= ~(1u << dequeued.CommandBufferIndex);
+
+ if (!entry.InUse && entry.CbRefMask == 0)
+ {
+ // If not in use by any array, and not bound to any command buffer, the descriptor set can be re-used immediately.
+ (_freeManualDsCacheEntries[dequeued.SetIndex] ??= new()).Enqueue(dequeued.CacheIndex);
+ }
+ }
+ }
+
public void ReleaseManualDescriptorSetCollection(int setIndex, int cacheIndex)
{
var list = _manualDsCache[setIndex];
var span = CollectionsMarshal.AsSpan(list);
span[cacheIndex].InUse = false;
+
+ if (span[cacheIndex].CbRefMask == 0)
+ {
+ // This is no longer in use by any array, so if not bound to any command buffer, the descriptor set can be re-used immediately.
+ (_freeManualDsCacheEntries[setIndex] ??= new()).Enqueue(cacheIndex);
+ }
}
private static Span GetDescriptorPoolSizes(Span output, ResourceDescriptorCollection setDescriptor, uint multiplier)
@@ -291,6 +366,11 @@ namespace Ryujinx.Graphics.Vulkan
_gd.Api.DestroyDescriptorSetLayout(_device, DescriptorSetLayouts[i], null);
}
+ while (_pendingManualDsConsumptions.TryDequeue(out var pds))
+ {
+ pds.Fence.Put();
+ }
+
_descriptorSetManager.Dispose();
}
}
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineLayoutFactory.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineLayoutFactory.cs
index 8bf286c654..bca119f6ad 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineLayoutFactory.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineLayoutFactory.cs
@@ -1,18 +1,23 @@
+using Ryujinx.Common.Memory;
using Ryujinx.Graphics.GAL;
using Silk.NET.Vulkan;
+using System;
using System.Collections.ObjectModel;
namespace Ryujinx.Graphics.Vulkan
{
+ record struct ResourceLayouts(DescriptorSetLayout[] DescriptorSetLayouts, bool[] DescriptorSetLayoutsUpdateAfterBind, PipelineLayout PipelineLayout);
+
static class PipelineLayoutFactory
{
- public static unsafe (DescriptorSetLayout[], PipelineLayout) Create(
+ public static unsafe ResourceLayouts Create(
VulkanRenderer gd,
Device device,
ReadOnlyCollection setDescriptors,
bool usePushDescriptors)
{
DescriptorSetLayout[] layouts = new DescriptorSetLayout[setDescriptors.Count];
+ bool[] updateAfterBindFlags = new bool[setDescriptors.Count];
bool isMoltenVk = gd.IsMoltenVk;
@@ -32,10 +37,11 @@ namespace Ryujinx.Graphics.Vulkan
DescriptorSetLayoutBinding[] layoutBindings = new DescriptorSetLayoutBinding[rdc.Descriptors.Count];
+ bool hasArray = false;
+
for (int descIndex = 0; descIndex < rdc.Descriptors.Count; descIndex++)
{
ResourceDescriptor descriptor = rdc.Descriptors[descIndex];
-
ResourceStages stages = descriptor.Stages;
if (descriptor.Type == ResourceType.StorageBuffer && isMoltenVk)
@@ -52,16 +58,37 @@ namespace Ryujinx.Graphics.Vulkan
DescriptorCount = (uint)descriptor.Count,
StageFlags = stages.Convert(),
};
+
+ if (descriptor.Count > 1)
+ {
+ hasArray = true;
+ }
}
fixed (DescriptorSetLayoutBinding* pLayoutBindings = layoutBindings)
{
+ DescriptorSetLayoutCreateFlags flags = DescriptorSetLayoutCreateFlags.None;
+
+ if (usePushDescriptors && setIndex == 0)
+ {
+ flags = DescriptorSetLayoutCreateFlags.PushDescriptorBitKhr;
+ }
+
+ if (gd.Vendor == Vendor.Intel && hasArray)
+ {
+ // Some vendors (like Intel) have low per-stage limits.
+ // We must set the flag if we exceed those limits.
+ flags |= DescriptorSetLayoutCreateFlags.UpdateAfterBindPoolBit;
+
+ updateAfterBindFlags[setIndex] = true;
+ }
+
var descriptorSetLayoutCreateInfo = new DescriptorSetLayoutCreateInfo
{
SType = StructureType.DescriptorSetLayoutCreateInfo,
PBindings = pLayoutBindings,
BindingCount = (uint)layoutBindings.Length,
- Flags = usePushDescriptors && setIndex == 0 ? DescriptorSetLayoutCreateFlags.PushDescriptorBitKhr : DescriptorSetLayoutCreateFlags.None,
+ Flags = flags,
};
gd.Api.CreateDescriptorSetLayout(device, descriptorSetLayoutCreateInfo, null, out layouts[setIndex]).ThrowOnError();
@@ -82,7 +109,7 @@ namespace Ryujinx.Graphics.Vulkan
gd.Api.CreatePipelineLayout(device, &pipelineLayoutCreateInfo, null, out layout).ThrowOnError();
}
- return (layouts, layout);
+ return new ResourceLayouts(layouts, updateAfterBindFlags, layout);
}
}
}
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineState.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
index c38748936b..2a8f930811 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineState.cs
@@ -71,244 +71,232 @@ namespace Ryujinx.Graphics.Vulkan
set => Internal.Id4 = (Internal.Id4 & 0xFFFFFFFF) | ((ulong)value << 32);
}
- public float MinDepthBounds
- {
- readonly get => BitConverter.Int32BitsToSingle((int)((Internal.Id5 >> 0) & 0xFFFFFFFF));
- set => Internal.Id5 = (Internal.Id5 & 0xFFFFFFFF00000000) | ((ulong)(uint)BitConverter.SingleToInt32Bits(value) << 0);
- }
-
- public float MaxDepthBounds
- {
- readonly get => BitConverter.Int32BitsToSingle((int)((Internal.Id5 >> 32) & 0xFFFFFFFF));
- set => Internal.Id5 = (Internal.Id5 & 0xFFFFFFFF) | ((ulong)(uint)BitConverter.SingleToInt32Bits(value) << 32);
- }
-
public PolygonMode PolygonMode
{
- readonly get => (PolygonMode)((Internal.Id6 >> 0) & 0x3FFFFFFF);
- set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFC0000000) | ((ulong)value << 0);
+ readonly get => (PolygonMode)((Internal.Id5 >> 0) & 0x3FFFFFFF);
+ set => Internal.Id5 = (Internal.Id5 & 0xFFFFFFFFC0000000) | ((ulong)value << 0);
}
public uint StagesCount
{
- readonly get => (byte)((Internal.Id6 >> 30) & 0xFF);
- set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFC03FFFFFFF) | ((ulong)value << 30);
+ readonly get => (byte)((Internal.Id5 >> 30) & 0xFF);
+ set => Internal.Id5 = (Internal.Id5 & 0xFFFFFFC03FFFFFFF) | ((ulong)value << 30);
}
public uint VertexAttributeDescriptionsCount
{
- readonly get => (byte)((Internal.Id6 >> 38) & 0xFF);
- set => Internal.Id6 = (Internal.Id6 & 0xFFFFC03FFFFFFFFF) | ((ulong)value << 38);
+ readonly get => (byte)((Internal.Id5 >> 38) & 0xFF);
+ set => Internal.Id5 = (Internal.Id5 & 0xFFFFC03FFFFFFFFF) | ((ulong)value << 38);
}
public uint VertexBindingDescriptionsCount
{
- readonly get => (byte)((Internal.Id6 >> 46) & 0xFF);
- set => Internal.Id6 = (Internal.Id6 & 0xFFC03FFFFFFFFFFF) | ((ulong)value << 46);
+ readonly get => (byte)((Internal.Id5 >> 46) & 0xFF);
+ set => Internal.Id5 = (Internal.Id5 & 0xFFC03FFFFFFFFFFF) | ((ulong)value << 46);
}
public uint ViewportsCount
{
- readonly get => (byte)((Internal.Id6 >> 54) & 0xFF);
- set => Internal.Id6 = (Internal.Id6 & 0xC03FFFFFFFFFFFFF) | ((ulong)value << 54);
+ readonly get => (byte)((Internal.Id5 >> 54) & 0xFF);
+ set => Internal.Id5 = (Internal.Id5 & 0xC03FFFFFFFFFFFFF) | ((ulong)value << 54);
}
public uint ScissorsCount
{
- readonly get => (byte)((Internal.Id7 >> 0) & 0xFF);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFFFFFFFF00) | ((ulong)value << 0);
+ readonly get => (byte)((Internal.Id6 >> 0) & 0xFF);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFFFFFFF00) | ((ulong)value << 0);
}
public uint ColorBlendAttachmentStateCount
{
- readonly get => (byte)((Internal.Id7 >> 8) & 0xFF);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFFFFFF00FF) | ((ulong)value << 8);
+ readonly get => (byte)((Internal.Id6 >> 8) & 0xFF);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFFFFF00FF) | ((ulong)value << 8);
}
public PrimitiveTopology Topology
{
- readonly get => (PrimitiveTopology)((Internal.Id7 >> 16) & 0xF);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFFFFF0FFFF) | ((ulong)value << 16);
+ readonly get => (PrimitiveTopology)((Internal.Id6 >> 16) & 0xF);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFFFF0FFFF) | ((ulong)value << 16);
}
public LogicOp LogicOp
{
- readonly get => (LogicOp)((Internal.Id7 >> 20) & 0xF);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFFFF0FFFFF) | ((ulong)value << 20);
+ readonly get => (LogicOp)((Internal.Id6 >> 20) & 0xF);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFFF0FFFFF) | ((ulong)value << 20);
}
public CompareOp DepthCompareOp
{
- readonly get => (CompareOp)((Internal.Id7 >> 24) & 0x7);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFFF8FFFFFF) | ((ulong)value << 24);
+ readonly get => (CompareOp)((Internal.Id6 >> 24) & 0x7);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFF8FFFFFF) | ((ulong)value << 24);
}
public StencilOp StencilFrontFailOp
{
- readonly get => (StencilOp)((Internal.Id7 >> 27) & 0x7);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFFC7FFFFFF) | ((ulong)value << 27);
+ readonly get => (StencilOp)((Internal.Id6 >> 27) & 0x7);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFFC7FFFFFF) | ((ulong)value << 27);
}
public StencilOp StencilFrontPassOp
{
- readonly get => (StencilOp)((Internal.Id7 >> 30) & 0x7);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFE3FFFFFFF) | ((ulong)value << 30);
+ readonly get => (StencilOp)((Internal.Id6 >> 30) & 0x7);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFFE3FFFFFFF) | ((ulong)value << 30);
}
public StencilOp StencilFrontDepthFailOp
{
- readonly get => (StencilOp)((Internal.Id7 >> 33) & 0x7);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFF1FFFFFFFF) | ((ulong)value << 33);
+ readonly get => (StencilOp)((Internal.Id6 >> 33) & 0x7);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFFFF1FFFFFFFF) | ((ulong)value << 33);
}
public CompareOp StencilFrontCompareOp
{
- readonly get => (CompareOp)((Internal.Id7 >> 36) & 0x7);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFFF8FFFFFFFFF) | ((ulong)value << 36);
+ readonly get => (CompareOp)((Internal.Id6 >> 36) & 0x7);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFFF8FFFFFFFFF) | ((ulong)value << 36);
}
public StencilOp StencilBackFailOp
{
- readonly get => (StencilOp)((Internal.Id7 >> 39) & 0x7);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFFC7FFFFFFFFF) | ((ulong)value << 39);
+ readonly get => (StencilOp)((Internal.Id6 >> 39) & 0x7);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFFC7FFFFFFFFF) | ((ulong)value << 39);
}
public StencilOp StencilBackPassOp
{
- readonly get => (StencilOp)((Internal.Id7 >> 42) & 0x7);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFFE3FFFFFFFFFF) | ((ulong)value << 42);
+ readonly get => (StencilOp)((Internal.Id6 >> 42) & 0x7);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFFE3FFFFFFFFFF) | ((ulong)value << 42);
}
public StencilOp StencilBackDepthFailOp
{
- readonly get => (StencilOp)((Internal.Id7 >> 45) & 0x7);
- set => Internal.Id7 = (Internal.Id7 & 0xFFFF1FFFFFFFFFFF) | ((ulong)value << 45);
+ readonly get => (StencilOp)((Internal.Id6 >> 45) & 0x7);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFFF1FFFFFFFFFFF) | ((ulong)value << 45);
}
public CompareOp StencilBackCompareOp
{
- readonly get => (CompareOp)((Internal.Id7 >> 48) & 0x7);
- set => Internal.Id7 = (Internal.Id7 & 0xFFF8FFFFFFFFFFFF) | ((ulong)value << 48);
+ readonly get => (CompareOp)((Internal.Id6 >> 48) & 0x7);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFF8FFFFFFFFFFFF) | ((ulong)value << 48);
}
public CullModeFlags CullMode
{
- readonly get => (CullModeFlags)((Internal.Id7 >> 51) & 0x3);
- set => Internal.Id7 = (Internal.Id7 & 0xFFE7FFFFFFFFFFFF) | ((ulong)value << 51);
+ readonly get => (CullModeFlags)((Internal.Id6 >> 51) & 0x3);
+ set => Internal.Id6 = (Internal.Id6 & 0xFFE7FFFFFFFFFFFF) | ((ulong)value << 51);
}
public bool PrimitiveRestartEnable
{
- readonly get => ((Internal.Id7 >> 53) & 0x1) != 0UL;
- set => Internal.Id7 = (Internal.Id7 & 0xFFDFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 53);
+ readonly get => ((Internal.Id6 >> 53) & 0x1) != 0UL;
+ set => Internal.Id6 = (Internal.Id6 & 0xFFDFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 53);
}
public bool DepthClampEnable
{
- readonly get => ((Internal.Id7 >> 54) & 0x1) != 0UL;
- set => Internal.Id7 = (Internal.Id7 & 0xFFBFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 54);
+ readonly get => ((Internal.Id6 >> 54) & 0x1) != 0UL;
+ set => Internal.Id6 = (Internal.Id6 & 0xFFBFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 54);
}
public bool RasterizerDiscardEnable
{
- readonly get => ((Internal.Id7 >> 55) & 0x1) != 0UL;
- set => Internal.Id7 = (Internal.Id7 & 0xFF7FFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 55);
+ readonly get => ((Internal.Id6 >> 55) & 0x1) != 0UL;
+ set => Internal.Id6 = (Internal.Id6 & 0xFF7FFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 55);
}
public FrontFace FrontFace
{
- readonly get => (FrontFace)((Internal.Id7 >> 56) & 0x1);
- set => Internal.Id7 = (Internal.Id7 & 0xFEFFFFFFFFFFFFFF) | ((ulong)value << 56);
+ readonly get => (FrontFace)((Internal.Id6 >> 56) & 0x1);
+ set => Internal.Id6 = (Internal.Id6 & 0xFEFFFFFFFFFFFFFF) | ((ulong)value << 56);
}
public bool DepthBiasEnable
{
- readonly get => ((Internal.Id7 >> 57) & 0x1) != 0UL;
- set => Internal.Id7 = (Internal.Id7 & 0xFDFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 57);
+ readonly get => ((Internal.Id6 >> 57) & 0x1) != 0UL;
+ set => Internal.Id6 = (Internal.Id6 & 0xFDFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 57);
}
public bool DepthTestEnable
{
- readonly get => ((Internal.Id7 >> 58) & 0x1) != 0UL;
- set => Internal.Id7 = (Internal.Id7 & 0xFBFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 58);
+ readonly get => ((Internal.Id6 >> 58) & 0x1) != 0UL;
+ set => Internal.Id6 = (Internal.Id6 & 0xFBFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 58);
}
public bool DepthWriteEnable
{
- readonly get => ((Internal.Id7 >> 59) & 0x1) != 0UL;
- set => Internal.Id7 = (Internal.Id7 & 0xF7FFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 59);
+ readonly get => ((Internal.Id6 >> 59) & 0x1) != 0UL;
+ set => Internal.Id6 = (Internal.Id6 & 0xF7FFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 59);
}
public bool DepthBoundsTestEnable
{
- readonly get => ((Internal.Id7 >> 60) & 0x1) != 0UL;
- set => Internal.Id7 = (Internal.Id7 & 0xEFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 60);
+ readonly get => ((Internal.Id6 >> 60) & 0x1) != 0UL;
+ set => Internal.Id6 = (Internal.Id6 & 0xEFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 60);
}
public bool StencilTestEnable
{
- readonly get => ((Internal.Id7 >> 61) & 0x1) != 0UL;
- set => Internal.Id7 = (Internal.Id7 & 0xDFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 61);
+ readonly get => ((Internal.Id6 >> 61) & 0x1) != 0UL;
+ set => Internal.Id6 = (Internal.Id6 & 0xDFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 61);
}
public bool LogicOpEnable
{
- readonly get => ((Internal.Id7 >> 62) & 0x1) != 0UL;
- set => Internal.Id7 = (Internal.Id7 & 0xBFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 62);
+ readonly get => ((Internal.Id6 >> 62) & 0x1) != 0UL;
+ set => Internal.Id6 = (Internal.Id6 & 0xBFFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 62);
}
public bool HasDepthStencil
{
- readonly get => ((Internal.Id7 >> 63) & 0x1) != 0UL;
- set => Internal.Id7 = (Internal.Id7 & 0x7FFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 63);
+ readonly get => ((Internal.Id6 >> 63) & 0x1) != 0UL;
+ set => Internal.Id6 = (Internal.Id6 & 0x7FFFFFFFFFFFFFFF) | ((value ? 1UL : 0UL) << 63);
}
public uint PatchControlPoints
{
- readonly get => (uint)((Internal.Id8 >> 0) & 0xFFFFFFFF);
- set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFF00000000) | ((ulong)value << 0);
+ readonly get => (uint)((Internal.Id7 >> 0) & 0xFFFFFFFF);
+ set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFF00000000) | ((ulong)value << 0);
}
public uint SamplesCount
{
- readonly get => (uint)((Internal.Id8 >> 32) & 0xFFFFFFFF);
- set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFF) | ((ulong)value << 32);
+ readonly get => (uint)((Internal.Id7 >> 32) & 0xFFFFFFFF);
+ set => Internal.Id7 = (Internal.Id7 & 0xFFFFFFFF) | ((ulong)value << 32);
}
public bool AlphaToCoverageEnable
{
- readonly get => ((Internal.Id9 >> 0) & 0x1) != 0UL;
- set => Internal.Id9 = (Internal.Id9 & 0xFFFFFFFFFFFFFFFE) | ((value ? 1UL : 0UL) << 0);
+ readonly get => ((Internal.Id8 >> 0) & 0x1) != 0UL;
+ set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFFE) | ((value ? 1UL : 0UL) << 0);
}
public bool AlphaToOneEnable
{
- readonly get => ((Internal.Id9 >> 1) & 0x1) != 0UL;
- set => Internal.Id9 = (Internal.Id9 & 0xFFFFFFFFFFFFFFFD) | ((value ? 1UL : 0UL) << 1);
+ readonly get => ((Internal.Id8 >> 1) & 0x1) != 0UL;
+ set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFFD) | ((value ? 1UL : 0UL) << 1);
}
public bool AdvancedBlendSrcPreMultiplied
{
- readonly get => ((Internal.Id9 >> 2) & 0x1) != 0UL;
- set => Internal.Id9 = (Internal.Id9 & 0xFFFFFFFFFFFFFFFB) | ((value ? 1UL : 0UL) << 2);
+ readonly get => ((Internal.Id8 >> 2) & 0x1) != 0UL;
+ set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFFB) | ((value ? 1UL : 0UL) << 2);
}
public bool AdvancedBlendDstPreMultiplied
{
- readonly get => ((Internal.Id9 >> 3) & 0x1) != 0UL;
- set => Internal.Id9 = (Internal.Id9 & 0xFFFFFFFFFFFFFFF7) | ((value ? 1UL : 0UL) << 3);
+ readonly get => ((Internal.Id8 >> 3) & 0x1) != 0UL;
+ set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFF7) | ((value ? 1UL : 0UL) << 3);
}
public BlendOverlapEXT AdvancedBlendOverlap
{
- readonly get => (BlendOverlapEXT)((Internal.Id9 >> 4) & 0x3);
- set => Internal.Id9 = (Internal.Id9 & 0xFFFFFFFFFFFFFFCF) | ((ulong)value << 4);
+ readonly get => (BlendOverlapEXT)((Internal.Id8 >> 4) & 0x3);
+ set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFCF) | ((ulong)value << 4);
}
public bool DepthMode
{
- readonly get => ((Internal.Id9 >> 6) & 0x1) != 0UL;
- set => Internal.Id9 = (Internal.Id9 & 0xFFFFFFFFFFFFFFBF) | ((value ? 1UL : 0UL) << 6);
+ readonly get => ((Internal.Id8 >> 6) & 0x1) != 0UL;
+ set => Internal.Id8 = (Internal.Id8 & 0xFFFFFFFFFFFFFFBF) | ((value ? 1UL : 0UL) << 6);
}
public bool HasTessellationControlShader;
@@ -408,8 +396,6 @@ namespace Ryujinx.Graphics.Vulkan
fixed (VertexInputAttributeDescription* pVertexAttributeDescriptions = &Internal.VertexAttributeDescriptions[0])
fixed (VertexInputAttributeDescription* pVertexAttributeDescriptions2 = &_vertexAttributeDescriptions2[0])
fixed (VertexInputBindingDescription* pVertexBindingDescriptions = &Internal.VertexBindingDescriptions[0])
- fixed (Viewport* pViewports = &Internal.Viewports[0])
- fixed (Rect2D* pScissors = &Internal.Scissors[0])
fixed (PipelineColorBlendAttachmentState* pColorBlendAttachmentState = &Internal.ColorBlendAttachmentState[0])
{
var vertexInputState = new PipelineVertexInputStateCreateInfo
@@ -472,18 +458,13 @@ namespace Ryujinx.Graphics.Vulkan
CullMode = CullMode,
FrontFace = FrontFace,
DepthBiasEnable = DepthBiasEnable,
- DepthBiasClamp = DepthBiasClamp,
- DepthBiasConstantFactor = DepthBiasConstantFactor,
- DepthBiasSlopeFactor = DepthBiasSlopeFactor,
};
var viewportState = new PipelineViewportStateCreateInfo
{
SType = StructureType.PipelineViewportStateCreateInfo,
ViewportCount = ViewportsCount,
- PViewports = pViewports,
ScissorCount = ScissorsCount,
- PScissors = pScissors,
};
if (gd.Capabilities.SupportsDepthClipControl)
@@ -511,19 +492,13 @@ namespace Ryujinx.Graphics.Vulkan
StencilFrontFailOp,
StencilFrontPassOp,
StencilFrontDepthFailOp,
- StencilFrontCompareOp,
- StencilFrontCompareMask,
- StencilFrontWriteMask,
- StencilFrontReference);
+ StencilFrontCompareOp);
var stencilBack = new StencilOpState(
StencilBackFailOp,
StencilBackPassOp,
StencilBackDepthFailOp,
- StencilBackCompareOp,
- StencilBackCompareMask,
- StencilBackWriteMask,
- StencilBackReference);
+ StencilBackCompareOp);
var depthStencilState = new PipelineDepthStencilStateCreateInfo
{
@@ -531,12 +506,10 @@ namespace Ryujinx.Graphics.Vulkan
DepthTestEnable = DepthTestEnable,
DepthWriteEnable = DepthWriteEnable,
DepthCompareOp = DepthCompareOp,
- DepthBoundsTestEnable = DepthBoundsTestEnable,
+ DepthBoundsTestEnable = false,
StencilTestEnable = StencilTestEnable,
Front = stencilFront,
Back = stencilBack,
- MinDepthBounds = MinDepthBounds,
- MaxDepthBounds = MaxDepthBounds,
};
uint blendEnables = 0;
@@ -591,22 +564,21 @@ namespace Ryujinx.Graphics.Vulkan
}
bool supportsExtDynamicState = gd.Capabilities.SupportsExtendedDynamicState;
- int dynamicStatesCount = supportsExtDynamicState ? 9 : 8;
+ int dynamicStatesCount = supportsExtDynamicState ? 8 : 7;
DynamicState* dynamicStates = stackalloc DynamicState[dynamicStatesCount];
dynamicStates[0] = DynamicState.Viewport;
dynamicStates[1] = DynamicState.Scissor;
dynamicStates[2] = DynamicState.DepthBias;
- dynamicStates[3] = DynamicState.DepthBounds;
- dynamicStates[4] = DynamicState.StencilCompareMask;
- dynamicStates[5] = DynamicState.StencilWriteMask;
- dynamicStates[6] = DynamicState.StencilReference;
- dynamicStates[7] = DynamicState.BlendConstants;
+ dynamicStates[3] = DynamicState.StencilCompareMask;
+ dynamicStates[4] = DynamicState.StencilWriteMask;
+ dynamicStates[5] = DynamicState.StencilReference;
+ dynamicStates[6] = DynamicState.BlendConstants;
if (supportsExtDynamicState)
{
- dynamicStates[8] = DynamicState.VertexInputBindingStrideExt;
+ dynamicStates[7] = DynamicState.VertexInputBindingStrideExt;
}
var pipelineDynamicStateCreateInfo = new PipelineDynamicStateCreateInfo
@@ -632,7 +604,6 @@ namespace Ryujinx.Graphics.Vulkan
PDynamicState = &pipelineDynamicStateCreateInfo,
Layout = PipelineLayout,
RenderPass = renderPass,
- BasePipelineIndex = -1,
};
Result result = gd.Api.CreateGraphicsPipelines(device, cache, 1, &pipelineCreateInfo, null, &pipelineHandle);
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineUid.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineUid.cs
index 238f06e2ac..c562242165 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineUid.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/PipelineUid.cs
@@ -17,20 +17,17 @@ namespace Ryujinx.Graphics.Vulkan
public ulong Id4;
public ulong Id5;
public ulong Id6;
+
public ulong Id7;
-
public ulong Id8;
- public ulong Id9;
- private readonly uint VertexAttributeDescriptionsCount => (byte)((Id6 >> 38) & 0xFF);
- private readonly uint VertexBindingDescriptionsCount => (byte)((Id6 >> 46) & 0xFF);
- private readonly uint ColorBlendAttachmentStateCount => (byte)((Id7 >> 8) & 0xFF);
- private readonly bool HasDepthStencil => ((Id7 >> 63) & 0x1) != 0UL;
+ private readonly uint VertexAttributeDescriptionsCount => (byte)((Id5 >> 38) & 0xFF);
+ private readonly uint VertexBindingDescriptionsCount => (byte)((Id5 >> 46) & 0xFF);
+ private readonly uint ColorBlendAttachmentStateCount => (byte)((Id6 >> 8) & 0xFF);
+ private readonly bool HasDepthStencil => ((Id6 >> 63) & 0x1) != 0UL;
public Array32 VertexAttributeDescriptions;
public Array33 VertexBindingDescriptions;
- public Array16 Viewports;
- public Array16 Scissors;
public Array8 ColorBlendAttachmentState;
public Array9 AttachmentFormats;
public uint AttachmentIntegerFormatMask;
@@ -45,7 +42,7 @@ namespace Ryujinx.Graphics.Vulkan
{
if (!Unsafe.As>(ref Id0).Equals(Unsafe.As>(ref other.Id0)) ||
!Unsafe.As>(ref Id4).Equals(Unsafe.As>(ref other.Id4)) ||
- !Unsafe.As>(ref Id8).Equals(Unsafe.As>(ref other.Id8)))
+ !Unsafe.As>(ref Id7).Equals(Unsafe.As>(ref other.Id7)))
{
return false;
}
@@ -88,8 +85,7 @@ namespace Ryujinx.Graphics.Vulkan
Id5 * 23 ^
Id6 * 23 ^
Id7 * 23 ^
- Id8 * 23 ^
- Id9 * 23;
+ Id8 * 23;
for (int i = 0; i < (int)VertexAttributeDescriptionsCount; i++)
{
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/ResourceArray.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/ResourceArray.cs
new file mode 100644
index 0000000000..0880a10f07
--- /dev/null
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/ResourceArray.cs
@@ -0,0 +1,74 @@
+using Silk.NET.Vulkan;
+using System;
+using System.Diagnostics;
+
+namespace Ryujinx.Graphics.Vulkan
+{
+ class ResourceArray : IDisposable
+ {
+ private DescriptorSet[] _cachedDescriptorSets;
+
+ private ShaderCollection _cachedDscProgram;
+ private int _cachedDscSetIndex;
+ private int _cachedDscIndex;
+
+ private int _bindCount;
+
+ protected void SetDirty(VulkanRenderer gd)
+ {
+ ReleaseDescriptorSet();
+
+ if (_bindCount != 0)
+ {
+ gd.PipelineInternal.ForceTextureDirty();
+ }
+ }
+
+ public bool TryGetCachedDescriptorSets(CommandBufferScoped cbs, ShaderCollection program, int setIndex, out DescriptorSet[] sets)
+ {
+ if (_cachedDescriptorSets != null)
+ {
+ _cachedDscProgram.UpdateManualDescriptorSetCollectionOwnership(cbs, _cachedDscSetIndex, _cachedDscIndex);
+
+ sets = _cachedDescriptorSets;
+
+ return true;
+ }
+
+ var dsc = program.GetNewManualDescriptorSetCollection(cbs, setIndex, out _cachedDscIndex).Get(cbs);
+
+ sets = dsc.GetSets();
+
+ _cachedDescriptorSets = sets;
+ _cachedDscProgram = program;
+ _cachedDscSetIndex = setIndex;
+
+ return false;
+ }
+
+ public void IncrementBindCount()
+ {
+ _bindCount++;
+ }
+
+ public void DecrementBindCount()
+ {
+ int newBindCount = --_bindCount;
+ Debug.Assert(newBindCount >= 0);
+ }
+
+ private void ReleaseDescriptorSet()
+ {
+ if (_cachedDescriptorSets != null)
+ {
+ _cachedDscProgram.ReleaseManualDescriptorSetCollection(_cachedDscSetIndex, _cachedDscIndex);
+ _cachedDescriptorSets = null;
+ }
+ }
+
+ public void Dispose()
+ {
+ ReleaseDescriptorSet();
+ }
+ }
+}
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
index f2d648a517..f9637789e3 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
@@ -604,9 +604,14 @@ namespace Ryujinx.Graphics.Vulkan
return _plce.GetNewDescriptorSetCollection(setIndex, out isNew);
}
- public Auto GetNewManualDescriptorSetCollection(int commandBufferIndex, int setIndex, out int cacheIndex)
+ public Auto GetNewManualDescriptorSetCollection(CommandBufferScoped cbs, int setIndex, out int cacheIndex)
{
- return _plce.GetNewManualDescriptorSetCollection(commandBufferIndex, setIndex, out cacheIndex);
+ return _plce.GetNewManualDescriptorSetCollection(cbs, setIndex, out cacheIndex);
+ }
+
+ public void UpdateManualDescriptorSetCollectionOwnership(CommandBufferScoped cbs, int setIndex, int cacheIndex)
+ {
+ _plce.UpdateManualDescriptorSetCollectionOwnership(cbs, setIndex, cacheIndex);
}
public void ReleaseManualDescriptorSetCollection(int setIndex, int cacheIndex)
diff --git a/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureArray.cs b/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureArray.cs
index fe834225c5..31c408d64f 100644
--- a/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureArray.cs
+++ b/ryujinx/src/Ryujinx.Graphics.Vulkan/TextureArray.cs
@@ -2,11 +2,10 @@ using Ryujinx.Graphics.GAL;
using Silk.NET.Vulkan;
using System;
using System.Collections.Generic;
-using System.Diagnostics;
namespace Ryujinx.Graphics.Vulkan
{
- class TextureArray : ITextureArray
+ class TextureArray : ResourceArray, ITextureArray
{
private readonly VulkanRenderer _gd;
@@ -25,19 +24,11 @@ namespace Ryujinx.Graphics.Vulkan
private HashSet _storages;
- private DescriptorSet[] _cachedDescriptorSets;
-
private int _cachedCommandBufferIndex;
private int _cachedSubmissionCount;
- private ShaderCollection _cachedDscProgram;
- private int _cachedDscSetIndex;
- private int _cachedDscIndex;
-
private readonly bool _isBuffer;
- private int _bindCount;
-
public TextureArray(VulkanRenderer gd, int size, bool isBuffer)
{
_gd = gd;
@@ -113,12 +104,7 @@ namespace Ryujinx.Graphics.Vulkan
{
_cachedCommandBufferIndex = -1;
_storages = null;
- _cachedDescriptorSets = null;
-
- if (_bindCount != 0)
- {
- _gd.PipelineInternal.ForceTextureDirty();
- }
+ SetDirty(_gd);
}
public void QueueWriteToReadBarriers(CommandBufferScoped cbs, PipelineStageFlags stageFlags)
@@ -211,7 +197,7 @@ namespace Ryujinx.Graphics.Vulkan
TextureView dummyTexture,
SamplerHolder dummySampler)
{
- if (_cachedDescriptorSets != null)
+ if (TryGetCachedDescriptorSets(cbs, program, setIndex, out DescriptorSet[] sets))
{
// We still need to ensure the current command buffer holds a reference to all used textures.
@@ -224,12 +210,9 @@ namespace Ryujinx.Graphics.Vulkan
GetBufferViews(cbs);
}
- return _cachedDescriptorSets;
+ return sets;
}
- _cachedDscProgram?.ReleaseManualDescriptorSetCollection(_cachedDscSetIndex, _cachedDscIndex);
- var dsc = program.GetNewManualDescriptorSetCollection(cbs.CommandBufferIndex, setIndex, out _cachedDscIndex).Get(cbs);
-
DescriptorSetTemplate template = program.Templates[setIndex];
DescriptorSetTemplateWriter tu = templateUpdater.Begin(template);
@@ -243,24 +226,9 @@ namespace Ryujinx.Graphics.Vulkan
tu.Push(GetBufferViews(cbs));
}
- var sets = dsc.GetSets();
templateUpdater.Commit(_gd, device, sets[0]);
- _cachedDescriptorSets = sets;
- _cachedDscProgram = program;
- _cachedDscSetIndex = setIndex;
return sets;
}
-
- public void IncrementBindCount()
- {
- _bindCount++;
- }
-
- public void DecrementBindCount()
- {
- int newBindCount = --_bindCount;
- Debug.Assert(newBindCount >= 0);
- }
}
}
diff --git a/ryujinx/src/Ryujinx.Gtk3/UI/Windows/AvatarWindow.cs b/ryujinx/src/Ryujinx.Gtk3/UI/Windows/AvatarWindow.cs
index 7cddc362be..d9ecd47b76 100644
--- a/ryujinx/src/Ryujinx.Gtk3/UI/Windows/AvatarWindow.cs
+++ b/ryujinx/src/Ryujinx.Gtk3/UI/Windows/AvatarWindow.cs
@@ -233,7 +233,7 @@ namespace Ryujinx.UI.Windows
reader.ReadInt64(); // Padding
byte[] input = new byte[stream.Length - stream.Position];
- stream.Read(input, 0, input.Length);
+ stream.ReadExactly(input, 0, input.Length);
long inputOffset = 0;
diff --git a/ryujinx/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs b/ryujinx/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
index 82783e638a..176011ddee 100644
--- a/ryujinx/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
+++ b/ryujinx/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
@@ -65,7 +65,7 @@ namespace Ryujinx.UI.App.Common
Stream resourceStream = Assembly.GetCallingAssembly().GetManifestResourceStream(resourceName);
byte[] resourceByteArray = new byte[resourceStream.Length];
- resourceStream.Read(resourceByteArray);
+ resourceStream.ReadExactly(resourceByteArray);
return resourceByteArray;
}
diff --git a/ryujinx/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs b/ryujinx/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
index 89b591229f..12adfe94bb 100644
--- a/ryujinx/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
+++ b/ryujinx/src/Ryujinx/UI/ViewModels/UserFirmwareAvatarSelectorViewModel.cs
@@ -151,7 +151,7 @@ namespace Ryujinx.Ava.UI.ViewModels
reader.ReadInt64(); // Padding
byte[] input = new byte[stream.Length - stream.Position];
- stream.Read(input, 0, input.Length);
+ stream.ReadExactly(input, 0, input.Length);
uint inputOffset = 0;
diff --git a/shadowsocks-rust/.github/workflows/build-release.yml b/shadowsocks-rust/.github/workflows/build-release.yml
index f9f5955ba8..17b97643c0 100644
--- a/shadowsocks-rust/.github/workflows/build-release.yml
+++ b/shadowsocks-rust/.github/workflows/build-release.yml
@@ -23,13 +23,13 @@ jobs:
matrix:
target:
- i686-unknown-linux-musl
- # - x86_64-pc-windows-gnu
+ - x86_64-pc-windows-gnu
- x86_64-unknown-linux-gnu
- x86_64-unknown-linux-musl
- # - armv7-unknown-linux-musleabihf
- # - armv7-unknown-linux-gnueabihf
+ - armv7-unknown-linux-musleabihf
+ - armv7-unknown-linux-gnueabihf
- arm-unknown-linux-gnueabi
- # - arm-unknown-linux-gnueabihf
+ - arm-unknown-linux-gnueabihf
- arm-unknown-linux-musleabi
- arm-unknown-linux-musleabihf
- aarch64-unknown-linux-gnu
diff --git a/shadowsocks-rust/Cargo.lock b/shadowsocks-rust/Cargo.lock
index c62a6ecd54..43e58e1c51 100644
--- a/shadowsocks-rust/Cargo.lock
+++ b/shadowsocks-rust/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
dependencies = [
"gimli",
]
@@ -200,38 +200,11 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-[[package]]
-name = "aws-lc-rs"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474d7cec9d0a1126fad1b224b767fcbf351c23b0309bb21ec210bcfd379926a5"
-dependencies = [
- "aws-lc-sys",
- "mirai-annotations",
- "paste",
- "zeroize",
-]
-
-[[package]]
-name = "aws-lc-sys"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7505fc3cb7acbf42699a43a79dd9caa4ed9e99861dfbb837c5c0fb5a0a8d2980"
-dependencies = [
- "bindgen",
- "cc",
- "cmake",
- "dunce",
- "fs_extra",
- "libc",
- "paste",
-]
-
[[package]]
name = "backtrace"
-version = "0.3.71"
+version = "0.3.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
dependencies = [
"addr2line",
"cc",
@@ -272,29 +245,6 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-[[package]]
-name = "bindgen"
-version = "0.69.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
-dependencies = [
- "bitflags 2.5.0",
- "cexpr",
- "clang-sys",
- "itertools",
- "lazy_static",
- "lazycell",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.66",
- "which",
-]
-
[[package]]
name = "bit-vec"
version = "0.6.3"
@@ -469,15 +419,6 @@ dependencies = [
"subtle",
]
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
[[package]]
name = "cfg-if"
version = "1.0.0"
@@ -537,17 +478,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "clang-sys"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
[[package]]
name = "clap"
version = "4.5.4"
@@ -808,12 +738,6 @@ dependencies = [
"windows-sys 0.48.0",
]
-[[package]]
-name = "dunce"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
-
[[package]]
name = "ecdsa"
version = "0.16.9"
@@ -835,12 +759,6 @@ dependencies = [
"signature",
]
-[[package]]
-name = "either"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
-
[[package]]
name = "elliptic-curve"
version = "0.13.8"
@@ -1005,12 +923,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
-
[[package]]
name = "fsevent-sys"
version = "4.1.0"
@@ -1160,15 +1072,9 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
[[package]]
name = "group"
@@ -1373,15 +1279,6 @@ dependencies = [
"digest",
]
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
[[package]]
name = "hostname"
version = "0.3.1"
@@ -1512,9 +1409,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
dependencies = [
"bytes",
"futures-channel",
@@ -1541,7 +1438,7 @@ dependencies = [
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core",
]
[[package]]
@@ -1621,12 +1518,6 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "ioctl-sys"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c"
-
[[package]]
name = "ipconfig"
version = "0.3.2"
@@ -1660,15 +1551,6 @@ version = "1.70.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
[[package]]
name = "itoa"
version = "1.0.11"
@@ -1750,12 +1632,6 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
[[package]]
name = "libc"
version = "0.2.155"
@@ -1924,12 +1800,6 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
[[package]]
name = "miniz_oxide"
version = "0.7.3"
@@ -1951,19 +1821,12 @@ dependencies = [
"windows-sys 0.48.0",
]
-[[package]]
-name = "mirai-annotations"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
-
[[package]]
name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
dependencies = [
- "lazy_static",
"libc",
"log",
"openssl",
@@ -1987,16 +1850,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
[[package]]
name = "notify"
version = "6.1.1"
@@ -2062,9 +1915,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.32.2"
+version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
dependencies = [
"memchr",
]
@@ -2225,12 +2078,6 @@ dependencies = [
"windows-targets 0.52.5",
]
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
[[package]]
name = "percent-encoding"
version = "2.3.1"
@@ -2365,16 +2212,6 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-[[package]]
-name = "prettyplease"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
-dependencies = [
- "proc-macro2",
- "syn 2.0.66",
-]
-
[[package]]
name = "primeorder"
version = "0.13.6"
@@ -2410,9 +2247,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.83"
+version = "1.0.84"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43"
+checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
dependencies = [
"unicode-ident",
]
@@ -2803,21 +2640,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "rustls"
-version = "0.23.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740"
-dependencies = [
- "aws-lc-rs",
- "log",
- "once_cell",
- "rustls-pki-types",
- "rustls-webpki 0.102.4",
- "subtle",
- "zeroize",
-]
-
[[package]]
name = "rustls-native-certs"
version = "0.6.3"
@@ -2884,7 +2706,6 @@ version = "0.102.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
dependencies = [
- "aws-lc-rs",
"ring 0.17.8",
"rustls-pki-types",
"untrusted 0.9.0",
@@ -2978,9 +2799,9 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.202"
+version = "1.0.203"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
dependencies = [
"serde_derive",
]
@@ -3006,9 +2827,9 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.202"
+version = "1.0.203"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
dependencies = [
"proc-macro2",
"quote",
@@ -3142,7 +2963,7 @@ dependencies = [
[[package]]
name = "shadowsocks-rust"
-version = "1.19.0"
+version = "1.19.2"
dependencies = [
"base64 0.22.1",
"build-time",
@@ -3183,7 +3004,7 @@ dependencies = [
[[package]]
name = "shadowsocks-service"
-version = "1.19.0"
+version = "1.19.2"
dependencies = [
"arc-swap",
"async-trait",
@@ -3221,8 +3042,8 @@ dependencies = [
"thiserror",
"tokio",
"tokio-native-tls",
- "tokio-rustls 0.26.0",
- "tun",
+ "tokio-rustls 0.25.0",
+ "tun2",
"webpki-roots 0.26.1",
"windows-sys 0.52.0",
]
@@ -3236,12 +3057,6 @@ dependencies = [
"lazy_static",
]
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
[[package]]
name = "signal-hook-registry"
version = "1.4.2"
@@ -3581,9 +3396,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
dependencies = [
"backtrace",
"bytes",
@@ -3600,9 +3415,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
dependencies = [
"proc-macro2",
"quote",
@@ -3640,17 +3455,6 @@ dependencies = [
"tokio",
]
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls 0.23.8",
- "rustls-pki-types",
- "tokio",
-]
-
[[package]]
name = "tokio-tfo"
version = "0.3.1"
@@ -3778,17 +3582,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
-name = "tun"
-version = "0.6.1"
+name = "tun2"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0adb9992bbd5ca76f3847ed579ad4ee8defb2ec2eea918cceef17ccc66fa4fd4"
+checksum = "5af6b725dd317dd689d1e37f559e70cfbe6e87effdaf5f62c80d919bfc9eda95"
dependencies = [
- "byteorder",
"bytes",
+ "cfg-if",
"futures-core",
- "ioctl-sys",
+ "ipnet",
"libc",
"log",
+ "nix",
"thiserror",
"tokio",
"tokio-util",
@@ -4036,18 +3841,6 @@ dependencies = [
"rustls-pki-types",
]
-[[package]]
-name = "which"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
-]
-
[[package]]
name = "widestring"
version = "1.1.0"
@@ -4087,21 +3880,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
-version = "0.51.1"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
dependencies = [
- "windows-core 0.51.1",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-dependencies = [
- "windows-targets 0.48.5",
+ "windows-core",
+ "windows-targets 0.52.5",
]
[[package]]
@@ -4285,9 +4069,9 @@ dependencies = [
[[package]]
name = "wintun"
-version = "0.3.2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29b83b0eca06dd125dbcd48a45327c708a6da8aada3d95a3f06db0ce4b17e0d4"
+checksum = "1b3c8c8876c686f8a2d6376999ac1c9a24c74d2968551c9394f7e89127783685"
dependencies = [
"c2rust-bitfields",
"libloading",
@@ -4333,23 +4117,9 @@ dependencies = [
[[package]]
name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
-dependencies = [
- "zeroize_derive",
-]
-
-[[package]]
-name = "zeroize_derive"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
[[package]]
name = "zstd"
diff --git a/shadowsocks-rust/Cargo.toml b/shadowsocks-rust/Cargo.toml
index 3a9795757a..76fc6306de 100644
--- a/shadowsocks-rust/Cargo.toml
+++ b/shadowsocks-rust/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "shadowsocks-rust"
-version = "1.19.0"
+version = "1.19.2"
authors = ["Shadowsocks Contributors"]
description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
repository = "https://github.com/shadowsocks/shadowsocks-rust"
@@ -248,7 +248,7 @@ jemallocator = { version = "0.5", optional = true }
snmalloc-rs = { version = "0.3", optional = true }
rpmalloc = { version = "0.2", optional = true }
-shadowsocks-service = { version = "1.19.0", path = "./crates/shadowsocks-service" }
+shadowsocks-service = { version = "1.19.2", path = "./crates/shadowsocks-service" }
windows-service = { version = "0.7", optional = true }
diff --git a/shadowsocks-rust/Cross.toml b/shadowsocks-rust/Cross.toml
index aafcef55cf..3035805387 100644
--- a/shadowsocks-rust/Cross.toml
+++ b/shadowsocks-rust/Cross.toml
@@ -1,45 +1,13 @@
[build]
+dockerfile = "./docker/linux-cross/Dockerfile"
pre-build = [
- # https://aws.github.io/aws-lc-rs/requirements/linux.html
- "apt-get update",
- "apt-get install --assume-yes llvm-5.0-dev libclang-5.0-dev clang-5.0",
"curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable",
". $HOME/.cargo/env",
"cargo install --force --locked bindgen-cli && mv $HOME/.cargo/bin/bindgen /usr/bin",
- "rustup self uninstall -y",
+ "rm -rf $HOME/.cargo"
]
+
[build.env]
passthrough = ["RUSTFLAGS"]
-[target.x86_64-pc-windows-gnu]
-pre-build = [
- # Install NASM for rustls, which deps on aws-lc-rs by default, and it needs NASM
- "apt-get update",
- "apt-get install --assume-yes llvm-5.0-dev libclang-5.0-dev clang-5.0 nasm",
- "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable",
- ". $HOME/.cargo/env",
- "cargo install --force --locked bindgen-cli && mv $HOME/.cargo/bin/bindgen /usr/bin",
- "rustup self uninstall -y",
-]
-
-[target.aarch64-unknown-linux-gnu]
-pre-build = []
-
-[target.aarch64-unknown-linux-musl]
-pre-build = []
-
-[target.x86_64-unknown-linux-gnu]
-pre-build = []
-
-[target.x86_64-unknown-linux-musl]
-pre-build = []
-
-[target.i686-unknown-linux-gnu]
-pre-build = []
-
-[target.aarch64-apple-darwin]
-pre-build = []
-
-[target.x86_64-apple-darwin]
-pre-build = []
diff --git a/shadowsocks-rust/crates/shadowsocks-service/Cargo.toml b/shadowsocks-rust/crates/shadowsocks-service/Cargo.toml
index cf4eb97ae2..5c4220a928 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/Cargo.toml
+++ b/shadowsocks-rust/crates/shadowsocks-service/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "shadowsocks-service"
-version = "1.19.0"
+version = "1.19.2"
authors = ["Shadowsocks Contributors"]
description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
repository = "https://github.com/shadowsocks/shadowsocks-rust"
@@ -93,7 +93,7 @@ local-tunnel = ["local"]
# Enable socks4 protocol for sslocal
local-socks4 = ["local"]
# Enable Tun interface protocol for sslocal
-local-tun = ["local", "etherparse", "tun", "smoltcp"]
+local-tun = ["local", "etherparse", "tun2", "smoltcp"]
# Enable Fake DNS
local-fake-dns = ["local", "trust-dns", "sled", "bson"]
# sslocal support online URL (SIP008 Online Configuration Delivery)
@@ -148,7 +148,7 @@ tokio = { version = "1.5", features = [
tokio-native-tls = { version = "0.3", optional = true }
native-tls = { version = "0.2.8", optional = true, features = ["alpn"] }
webpki-roots = { version = "0.26", optional = true }
-tokio-rustls = { version = "0.26", optional = true }
+tokio-rustls = { version = "0.25", optional = true }
rustls-native-certs = { version = "0.7", optional = true }
async-trait = "0.1"
@@ -167,7 +167,7 @@ ipnet = "2.9"
iprange = "0.6"
regex = "1.4"
-tun = { version = "0.6", optional = true, features = ["async"] }
+tun2 = { version = "1", optional = true, features = ["async"] }
etherparse = { version = "0.15", optional = true }
smoltcp = { version = "0.11", optional = true, default-features = false, features = [
"std",
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs
index acc9bb65f4..aae4f58f7c 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs
+++ b/shadowsocks-rust/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs
@@ -7,7 +7,6 @@ use std::{
task::{Context, Poll},
};
-use cfg_if::cfg_if;
use futures::{future::poll_fn, ready};
use log::{error, trace, warn};
use shadowsocks::net::is_dual_stack_addr;
@@ -148,31 +147,11 @@ impl UdpSocketRedir for UdpRedirSocket {
loop {
let mut read_guard = ready!(self.io.poll_read_ready(cx))?;
- cfg_if! {
- if #[cfg(any(target_os = "macos", target_os = "ios"))] {
- use crate::local::redir::sys::bsd_pf::PF;
-
- let (peer_addr, n) = match self.io.get_ref().recv_from(buf) {
- Err(ref e) if e.kind() == ErrorKind::WouldBlock => {
- read_guard.clear_ready();
- continue;
- }
- Err(e) => return Err(e),
- Ok(x) => x,
- };
-
- let bind_addr = self.local_addr()?;
- let actual_addr = PF.natlook(&bind_addr, &peer_addr, Protocol::UDP)?;
-
- return Ok((n, peer_addr, actual_addr));
- } else if #[cfg(target_os = "freebsd")] {
- match recv_dest_from(self.io.get_ref(), buf) {
- Err(ref e) if e.kind() == ErrorKind::WouldBlock => {
- read_guard.clear_ready();
- }
- x => return Poll::Ready(x),
- }
+ match recv_dest_from(self.io.get_ref(), buf) {
+ Err(ref e) if e.kind() == ErrorKind::WouldBlock => {
+ read_guard.clear_ready();
}
+ x => return Poll::Ready(x),
}
}
}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs
index c11782b1aa..fd34ff6cad 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs
+++ b/shadowsocks-rust/crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/macos.rs
@@ -1,52 +1,208 @@
use std::{
- io,
- net::SocketAddr,
+ io::{self, Error, ErrorKind},
+ mem,
+ net::{SocketAddr, UdpSocket},
+ os::unix::io::AsRawFd,
task::{Context, Poll},
};
+use futures::{future::poll_fn, ready};
+use log::{error, trace, warn};
+use shadowsocks::net::is_dual_stack_addr;
+use socket2::{Domain, Protocol, SockAddr, Socket, Type};
+use tokio::io::unix::AsyncFd;
+
use crate::{
config::RedirType,
- local::redir::redir_ext::{RedirSocketOpts, UdpSocketRedir},
+ local::redir::{
+ redir_ext::{RedirSocketOpts, UdpSocketRedir},
+ sys::{bsd_pf::PF, set_ipv6_only},
+ },
};
-pub struct UdpRedirSocket;
+pub struct UdpRedirSocket {
+ io: AsyncFd,
+}
impl UdpRedirSocket {
/// Create a new UDP socket binded to `addr`
///
/// This will allow listening to `addr` that is not in local host
- pub fn listen(_ty: RedirType, _addr: SocketAddr) -> io::Result {
- unimplemented!("UDP transparent proxy is not supported on macOS, iOS, ...")
+ pub fn listen(ty: RedirType, addr: SocketAddr) -> io::Result {
+ UdpRedirSocket::bind(ty, addr, false)
}
/// Create a new UDP socket binded to `addr`
///
/// This will allow binding to `addr` that is not in local host
- pub fn bind_nonlocal(
- _ty: RedirType,
- _addr: SocketAddr,
- _redir_opts: &RedirSocketOpts,
- ) -> io::Result {
- unimplemented!("UDP transparent proxy is not supported on macOS, iOS, ...")
+ pub fn bind_nonlocal(ty: RedirType, addr: SocketAddr, _: &RedirSocketOpts) -> io::Result {
+ UdpRedirSocket::bind(ty, addr, true)
+ }
+
+ fn bind(ty: RedirType, addr: SocketAddr, reuse_port: bool) -> io::Result {
+ if ty == RedirType::NotSupported {
+ return Err(Error::new(
+ ErrorKind::InvalidInput,
+ "not supported udp transparent proxy type",
+ ));
+ }
+
+ let socket = Socket::new(Domain::for_address(addr), Type::DGRAM, Some(Protocol::UDP))?;
+ set_socket_before_bind(&addr, &socket)?;
+
+ socket.set_nonblocking(true)?;
+ socket.set_reuse_address(true)?;
+ if reuse_port {
+ if let Err(err) = socket.set_reuse_port(true) {
+ if let Some(errno) = err.raw_os_error() {
+ match errno {
+ libc::ENOPROTOOPT => {
+ trace!("failed to set SO_REUSEPORT, error: {}", err);
+ }
+ _ => {
+ error!("failed to set SO_REUSEPORT, error: {}", err);
+ return Err(err);
+ }
+ }
+ } else {
+ error!("failed to set SO_REUSEPORT, error: {}", err);
+ return Err(err);
+ }
+ }
+ }
+
+ let sock_addr = SockAddr::from(addr);
+
+ if is_dual_stack_addr(&addr) {
+ // set IP_ORIGDSTADDR before bind()
+
+ match set_ipv6_only(&socket, false) {
+ Ok(..) => {
+ if let Err(err) = socket.bind(&sock_addr) {
+ warn!(
+ "bind() dual-stack address {} failed, error: {}, fallback to IPV6_V6ONLY=true",
+ addr, err
+ );
+
+ if let Err(err) = set_ipv6_only(&socket, true) {
+ warn!(
+ "set IPV6_V6ONLY=true failed, error: {}, bind() to {} directly",
+ err, addr
+ );
+ }
+
+ socket.bind(&sock_addr)?;
+ }
+ }
+ Err(err) => {
+ warn!(
+ "set IPV6_V6ONLY=false failed, error: {}, bind() to {} directly",
+ err, addr
+ );
+ socket.bind(&sock_addr)?;
+ }
+ }
+ } else {
+ socket.bind(&sock_addr)?;
+ }
+
+ let io = AsyncFd::new(socket.into())?;
+ Ok(UdpRedirSocket { io })
}
/// Send data to the socket to the given target address
- pub async fn send_to(&self, _buf: &[u8], _target: SocketAddr) -> io::Result {
- unimplemented!("UDP transparent proxy is not supported on macOS, iOS, ...")
+ pub async fn send_to(&self, buf: &[u8], target: SocketAddr) -> io::Result {
+ poll_fn(|cx| self.poll_send_to(cx, buf, target)).await
+ }
+
+ fn poll_send_to(&self, cx: &mut Context<'_>, buf: &[u8], target: SocketAddr) -> Poll> {
+ loop {
+ let mut write_guard = ready!(self.io.poll_write_ready(cx))?;
+
+ match self.io.get_ref().send_to(buf, target) {
+ Err(ref e) if e.kind() == ErrorKind::WouldBlock => {
+ write_guard.clear_ready();
+ }
+ x => return Poll::Ready(x),
+ }
+ }
}
/// Returns the local address that this socket is bound to.
pub fn local_addr(&self) -> io::Result {
- unimplemented!("UDP transparent proxy is not supported on macOS, iOS, ...")
+ self.io.get_ref().local_addr()
}
}
impl UdpSocketRedir for UdpRedirSocket {
fn poll_recv_dest_from(
&self,
- _cx: &mut Context<'_>,
- _buf: &mut [u8],
+ cx: &mut Context<'_>,
+ buf: &mut [u8],
) -> Poll> {
- unimplemented!("UDP transparent proxy is not supported on macOS, iOS, ...")
+ loop {
+ let mut read_guard = ready!(self.io.poll_read_ready(cx))?;
+
+ let (n, peer_addr) = match self.io.get_ref().recv_from(buf) {
+ Err(ref e) if e.kind() == ErrorKind::WouldBlock => {
+ read_guard.clear_ready();
+ continue;
+ }
+ Err(e) => return Err(e).into(),
+ Ok(x) => x,
+ };
+
+ let bind_addr = self.local_addr()?;
+ let actual_addr = PF.natlook(&bind_addr, &peer_addr, Protocol::UDP)?;
+
+ return Ok((n, peer_addr, actual_addr)).into();
+ }
}
}
+
+fn set_disable_ip_fragmentation(level: libc::c_int, socket: &Socket) -> io::Result<()> {
+ // https://www.freebsd.org/cgi/man.cgi?query=ip&sektion=4&manpath=FreeBSD+9.0-RELEASE
+
+ // sys/netinet/in.h
+ const IP_DONTFRAG: libc::c_int = 67; // don't fragment packet
+
+ // sys/netinet6/in6.h
+ const IPV6_DONTFRAG: libc::c_int = 62; // bool; disable IPv6 fragmentation
+
+ let enable: libc::c_int = 1;
+
+ let opt = match level {
+ libc::IPPROTO_IP => IP_DONTFRAG,
+ libc::IPPROTO_IPV6 => IPV6_DONTFRAG,
+ _ => unreachable!("level can only be IPPROTO_IP or IPPROTO_IPV6"),
+ };
+
+ unsafe {
+ let ret = libc::setsockopt(
+ socket.as_raw_fd(),
+ level,
+ opt,
+ &enable as *const _ as *const _,
+ mem::size_of_val(&enable) as libc::socklen_t,
+ );
+
+ if ret < 0 {
+ return Err(io::Error::last_os_error());
+ }
+ }
+
+ Ok(())
+}
+
+fn set_socket_before_bind(addr: &SocketAddr, socket: &Socket) -> io::Result<()> {
+ // https://www.freebsd.org/cgi/man.cgi?query=ip&sektion=4&manpath=FreeBSD+9.0-RELEASE
+ let level = match *addr {
+ SocketAddr::V4(..) => libc::IPPROTO_IP,
+ SocketAddr::V6(..) => libc::IPPROTO_IPV6,
+ };
+
+ // 1. disable IP fragmentation
+ set_disable_ip_fragmentation(level, socket)?;
+
+ Ok(())
+}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/fake_tun.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/fake_tun.rs
index f28b3ea30c..b374847ba1 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/fake_tun.rs
+++ b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/fake_tun.rs
@@ -2,13 +2,13 @@
use std::{
io::{self, Read, Write},
- net::Ipv4Addr,
+ net::IpAddr,
pin::Pin,
task::{Context, Poll},
};
use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
-use tun::{Configuration, Device, Error as TunError};
+use tun2::{AbstractDevice, Configuration, Error as TunError};
pub struct FakeQueue;
@@ -30,63 +30,61 @@ impl Write for FakeQueue {
pub struct FakeDevice;
-impl Device for FakeDevice {
- type Queue = FakeQueue;
-
- fn name(&self) -> tun::Result {
+impl AbstractDevice for FakeDevice {
+ fn tun_name(&self) -> tun2::Result {
Err(TunError::NotImplemented)
}
- fn set_name(&mut self, _: &str) -> tun::Result<()> {
+ fn set_tun_name(&mut self, _: &str) -> tun2::Result<()> {
Err(TunError::NotImplemented)
}
- fn enabled(&mut self, _: bool) -> tun::Result<()> {
+ fn enabled(&mut self, _: bool) -> tun2::Result<()> {
Err(TunError::NotImplemented)
}
- fn address(&self) -> tun::Result {
+ fn address(&self) -> tun2::Result {
Err(TunError::NotImplemented)
}
- fn set_address(&mut self, _: Ipv4Addr) -> tun::Result<()> {
+ fn set_address(&mut self, _: IpAddr) -> tun2::Result<()> {
Err(TunError::NotImplemented)
}
- fn destination(&self) -> tun::Result {
+ fn destination(&self) -> tun2::Result {
Err(TunError::NotImplemented)
}
- fn set_destination(&mut self, _: Ipv4Addr) -> tun::Result<()> {
+ fn set_destination(&mut self, _: IpAddr) -> tun2::Result<()> {
Err(TunError::NotImplemented)
}
- fn broadcast(&self) -> tun::Result {
+ fn broadcast(&self) -> tun2::Result {
Err(TunError::NotImplemented)
}
- fn set_broadcast(&mut self, _: Ipv4Addr) -> tun::Result<()> {
+ fn set_broadcast(&mut self, _: IpAddr) -> tun2::Result<()> {
Err(TunError::NotImplemented)
}
- fn netmask(&self) -> tun::Result {
+ fn netmask(&self) -> tun2::Result {
Err(TunError::NotImplemented)
}
- fn set_netmask(&mut self, _: Ipv4Addr) -> tun::Result<()> {
+ fn set_netmask(&mut self, _: IpAddr) -> tun2::Result<()> {
Err(TunError::NotImplemented)
}
- fn mtu(&self) -> tun::Result {
+ fn mtu(&self) -> tun2::Result {
Err(TunError::NotImplemented)
}
- fn set_mtu(&mut self, _: i32) -> tun::Result<()> {
+ fn set_mtu(&mut self, _: u16) -> tun2::Result<()> {
Err(TunError::NotImplemented)
}
- fn queue(&mut self, _: usize) -> Option<&mut Self::Queue> {
- None
+ fn packet_information(&self) -> bool {
+ false
}
}
@@ -108,12 +106,14 @@ impl Write for FakeDevice {
pub struct AsyncDevice(FakeDevice);
-impl AsyncDevice {
- pub fn get_ref(&self) -> &FakeDevice {
+impl AsRef for AsyncDevice {
+ fn as_ref(&self) -> &FakeDevice {
&self.0
}
+}
- pub fn get_mut(&mut self) -> &mut FakeDevice {
+impl AsMut for AsyncDevice {
+ fn as_mut(&mut self) -> &mut FakeDevice {
&mut self.0
}
}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/mod.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/mod.rs
index ce65b5f950..53dc2d183c 100644
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/mod.rs
+++ b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/mod.rs
@@ -4,30 +4,35 @@
use std::os::unix::io::RawFd;
use std::{
io::{self, ErrorKind},
- net::{IpAddr, Ipv4Addr, SocketAddr},
+ net::{IpAddr, SocketAddr},
sync::Arc,
time::Duration,
};
use byte_string::ByteStr;
use cfg_if::cfg_if;
-use ipnet::{IpNet, Ipv4Net};
+use ipnet::IpNet;
use log::{debug, error, info, trace, warn};
use shadowsocks::config::Mode;
use smoltcp::wire::{IpProtocol, TcpPacket, UdpPacket};
-use tokio::{io::AsyncReadExt, sync::mpsc, time};
+use tokio::{
+ io::{AsyncReadExt, AsyncWriteExt},
+ sync::mpsc,
+ time,
+};
cfg_if! {
if #[cfg(any(target_os = "ios",
target_os = "macos",
target_os = "linux",
target_os = "android",
- target_os = "windows"))] {
- use tun::{
- create_as_async, AsyncDevice, Configuration as TunConfiguration, Device as TunDevice, Error as TunError, Layer,
+ target_os = "windows",
+ target_os = "freebsd"))] {
+ use tun2::{
+ create_as_async, AsyncDevice, Configuration as TunConfiguration, AbstractDevice, Error as TunError, Layer,
};
} else {
- use tun::{Configuration as TunConfiguration, Device as TunDevice, Error as TunError, Layer};
+ use tun2::{AbstractDevice, Configuration as TunConfiguration, Error as TunError, Layer};
mod fake_tun;
use self::fake_tun::{create_as_async, AsyncDevice};
@@ -36,15 +41,9 @@ cfg_if! {
use crate::local::{context::ServiceContext, loadbalancing::PingBalancer};
-use self::{
- ip_packet::IpPacket,
- sys::{write_packet_with_pi, IFF_PI_PREFIX_LEN},
- tcp::TcpTun,
- udp::UdpTun,
-};
+use self::{ip_packet::IpPacket, tcp::TcpTun, udp::UdpTun};
mod ip_packet;
-mod sys;
mod tcp;
mod udp;
mod virt_device;
@@ -84,7 +83,7 @@ impl TunBuilder {
}
pub fn name(&mut self, name: &str) {
- self.tun_config.name(name);
+ self.tun_config.tun_name(name);
}
#[cfg(unix)]
@@ -108,11 +107,13 @@ impl TunBuilder {
pub async fn build(mut self) -> io::Result {
self.tun_config.layer(Layer::L3).up();
- #[cfg(target_os = "linux")]
- self.tun_config.platform(|tun_config| {
- // IFF_NO_PI preventing excessive buffer reallocating
- tun_config.packet_information(false);
- });
+ // XXX: tun2 set IFF_NO_PI by default.
+ //
+ // #[cfg(target_os = "linux")]
+ // self.tun_config.platform_config(|tun_config| {
+ // // IFF_NO_PI preventing excessive buffer reallocating
+ // tun_config.packet_information(false);
+ // });
let device = match create_as_async(&self.tun_config) {
Ok(d) => d,
@@ -130,7 +131,7 @@ impl TunBuilder {
let tcp = TcpTun::new(
self.context,
self.balancer,
- device.get_ref().mtu().unwrap_or(1500) as u32,
+ device.as_ref().mtu().unwrap_or(1500) as u32,
);
Ok(Tun {
@@ -157,21 +158,17 @@ pub struct Tun {
impl Tun {
/// Start serving
pub async fn run(mut self) -> io::Result<()> {
- if let Ok(mtu) = self.device.get_ref().mtu() {
- assert!(mtu > 0 && mtu as usize > IFF_PI_PREFIX_LEN);
- }
-
info!(
"shadowsocks tun device {}, mode {}",
self.device
- .get_ref()
- .name()
+ .as_ref()
+ .tun_name()
.or_else(|r| Ok::<_, ()>(r.to_string()))
.unwrap(),
self.mode,
);
- let address = match self.device.get_ref().address() {
+ let address = match self.device.as_ref().address() {
Ok(a) => a,
Err(err) => {
error!("[TUN] failed to get device address, error: {}", err);
@@ -179,7 +176,7 @@ impl Tun {
}
};
- let netmask = match self.device.get_ref().netmask() {
+ let netmask = match self.device.as_ref().netmask() {
Ok(n) => n,
Err(err) => {
error!("[TUN] failed to get device netmask, error: {}", err);
@@ -187,7 +184,7 @@ impl Tun {
}
};
- let address_net = match Ipv4Net::with_netmask(address, netmask) {
+ let address_net = match IpNet::with_netmask(address, netmask) {
Ok(n) => n,
Err(err) => {
error!("[TUN] invalid address {}, netmask {}, error: {}", address, netmask, err);
@@ -202,14 +199,9 @@ impl Tun {
netmask
);
- // Set default route
- if let Err(err) = sys::set_route_configuration(self.device.get_mut()).await {
- warn!("[TUN] tun device set route failed, error: {}", err);
- }
-
let address_broadcast = address_net.broadcast();
- let mut packet_buffer = vec![0u8; 65536 + IFF_PI_PREFIX_LEN].into_boxed_slice();
+ let mut packet_buffer = vec![0u8; 65536].into_boxed_slice();
let mut udp_cleanup_timer = time::interval(self.udp_cleanup_interval);
loop {
@@ -218,15 +210,7 @@ impl Tun {
n = self.device.read(&mut packet_buffer) => {
let n = n?;
- if n <= IFF_PI_PREFIX_LEN {
- error!(
- "[TUN] packet too short, packet: {:?}",
- ByteStr::new(&packet_buffer[..n])
- );
- continue;
- }
-
- let packet = &mut packet_buffer[IFF_PI_PREFIX_LEN..n];
+ let packet = &mut packet_buffer[..n];
trace!("[TUN] received IP packet {:?}", ByteStr::new(packet));
if let Err(err) = self.handle_tun_frame(&address_broadcast, packet).await {
@@ -236,10 +220,17 @@ impl Tun {
// UDP channel sent back
packet = self.udp.recv_packet() => {
- if let Err(err) = write_packet_with_pi(&mut self.device, &packet).await {
- error!("[TUN] failed to set packet information, error: {}, {:?}", err, ByteStr::new(&packet));
- } else {
- trace!("[TUN] sent IP packet (UDP) {:?}", ByteStr::new(&packet));
+ match self.device.write(&packet).await {
+ Ok(n) => {
+ if n < packet.len() {
+ warn!("[TUN] sent IP packet (UDP), but truncated. sent {} < {}, {:?}", n, packet.len(), ByteStr::new(&packet));
+ } else {
+ trace!("[TUN] sent IP packet (UDP) {:?}", ByteStr::new(&packet));
+ }
+ }
+ Err(err) => {
+ error!("[TUN] failed to set packet information, error: {}, {:?}", err, ByteStr::new(&packet));
+ }
}
}
@@ -256,17 +247,24 @@ impl Tun {
// TCP channel sent back
packet = self.tcp.recv_packet() => {
- if let Err(err) = write_packet_with_pi(&mut self.device, &packet).await {
- error!("[TUN] failed to set packet information, error: {}, {:?}", err, ByteStr::new(&packet));
- } else {
- trace!("[TUN] sent IP packet (TCP) {:?}", ByteStr::new(&packet));
+ match self.device.write(&packet).await {
+ Ok(n) => {
+ if n < packet.len() {
+ warn!("[TUN] sent IP packet (TCP), but truncated. sent {} < {}, {:?}", n, packet.len(), ByteStr::new(&packet));
+ } else {
+ trace!("[TUN] sent IP packet (TCP) {:?}", ByteStr::new(&packet));
+ }
+ }
+ Err(err) => {
+ error!("[TUN] failed to set packet information, error: {}, {:?}", err, ByteStr::new(&packet));
+ }
}
}
}
}
}
- async fn handle_tun_frame(&mut self, device_broadcast_addr: &Ipv4Addr, frame: &[u8]) -> smoltcp::wire::Result<()> {
+ async fn handle_tun_frame(&mut self, device_broadcast_addr: &IpAddr, frame: &[u8]) -> smoltcp::wire::Result<()> {
let packet = match IpPacket::new_checked(frame)? {
Some(packet) => packet,
None => {
@@ -275,20 +273,20 @@ impl Tun {
}
};
+ trace!("[TUN] {:?}", packet);
+
let src_ip_addr = packet.src_addr();
let dst_ip_addr = packet.dst_addr();
- let src_non_unicast = match src_ip_addr {
- IpAddr::V4(v4) => {
- v4.is_broadcast() || v4.is_multicast() || v4.is_unspecified() || v4 == *device_broadcast_addr
- }
- IpAddr::V6(v6) => v6.is_multicast() || v6.is_unspecified(),
- };
- let dst_non_unicast = match dst_ip_addr {
- IpAddr::V4(v4) => {
- v4.is_broadcast() || v4.is_multicast() || v4.is_unspecified() || v4 == *device_broadcast_addr
- }
- IpAddr::V6(v6) => v6.is_multicast() || v6.is_unspecified(),
- };
+ let src_non_unicast = src_ip_addr == *device_broadcast_addr
+ || match src_ip_addr {
+ IpAddr::V4(v4) => v4.is_broadcast() || v4.is_multicast() || v4.is_unspecified(),
+ IpAddr::V6(v6) => v6.is_multicast() || v6.is_unspecified(),
+ };
+ let dst_non_unicast = dst_ip_addr == *device_broadcast_addr
+ || match dst_ip_addr {
+ IpAddr::V4(v4) => v4.is_broadcast() || v4.is_multicast() || v4.is_unspecified(),
+ IpAddr::V6(v6) => v6.is_multicast() || v6.is_unspecified(),
+ };
if src_non_unicast || dst_non_unicast {
trace!(
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/mod.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/mod.rs
deleted file mode 100644
index c44ea91faa..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/mod.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#![allow(unused)]
-
-use cfg_if::cfg_if;
-
-cfg_if! {
- if #[cfg(unix)] {
- mod unix;
- pub use self::unix::*;
- } else if #[cfg(windows)] {
- mod windows;
- pub use self::windows::*;
- } else {
- mod others;
- pub use self::others::*;
- }
-}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/others.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/others.rs
deleted file mode 100644
index fb966718fb..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/others.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::{
- io::{self, Read, Write},
- marker::Unpin,
-};
-
-use tokio::io::{AsyncWrite, AsyncWriteExt};
-use tun::Device;
-
-/// Packet Information length in bytes
-pub const IFF_PI_PREFIX_LEN: usize = 0;
-
-/// Writing packet with packet information
-pub async fn write_packet_with_pi(writer: &mut W, packet: &[u8]) -> io::Result<()> {
- writer.write_all(packet).await
-}
-
-/// Set platform specific route configuration
-pub async fn set_route_configuration(_: &mut (dyn Device + Send)) -> io::Result<()>
-where
- Q: Read + Write,
-{
- Ok(())
-}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/android.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/android.rs
deleted file mode 100644
index e2937c234f..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/android.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::{
- io::{self, Read, Write},
- marker::Unpin,
-};
-
-use tokio::io::{AsyncWrite, AsyncWriteExt};
-use tun::Device;
-
-/// Packet Information length in bytes
-///
-/// Tun device on Android doesn't have Packet Information header, so ther is no prefix headers
-pub const IFF_PI_PREFIX_LEN: usize = 0;
-
-/// Writing packet with packet information
-///
-/// Tun device on Android doesn't have Packet Information header, so there is nothing to prepend on Linux
-pub async fn write_packet_with_pi(writer: &mut W, packet: &[u8]) -> io::Result<()> {
- writer.write_all(packet).await
-}
-
-/// Set platform specific route configuration
-pub async fn set_route_configuration(_: &mut (dyn Device + Send)) -> io::Result<()>
-where
- Q: Read + Write,
-{
- Ok(())
-}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/apple/macos.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/apple/macos.rs
deleted file mode 100644
index 8cf468f197..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/apple/macos.rs
+++ /dev/null
@@ -1,180 +0,0 @@
-use std::{
- ffi::CStr,
- io::{self, ErrorKind, Read, Write},
- mem,
- ptr,
-};
-
-use log::{error, trace};
-use tun::{Device, Error as TunError};
-
-/// These numbers are used by reliable protocols for determining
-/// retransmission behavior and are included in the routing structure.
-#[repr(C)]
-#[allow(non_camel_case_types)]
-#[derive(Debug, Clone, Copy)]
-struct rt_metrics {
- rmx_locks: u32, //< Kernel must leave these values alone
- rmx_mtu: u32, //< MTU for this path
- rmx_hopcount: u32, //< max hops expected
- rmx_expire: i32, //< lifetime for route, e.g. redirect
- rmx_recvpipe: u32, //< inbound delay-bandwidth product
- rmx_sendpipe: u32, //< outbound delay-bandwidth product
- rmx_ssthresh: u32, //< outbound gateway buffer limit
- rmx_rtt: u32, //< estimated round trip time
- rmx_rttvar: u32, //< estimated rtt variance
- rmx_pksent: u32, //< packets sent using this route
- rmx_state: u32, //< route state
- rmx_filler: [u32; 3], //< will be used for T/TCP later
-}
-
-/// Structures for routing messages.
-#[repr(C)]
-#[allow(non_camel_case_types)]
-#[derive(Debug, Clone, Copy)]
-struct rt_msghdr {
- rtm_msglen: libc::c_ushort, //< to skip over non-understood messages
- rtm_version: libc::c_uchar, //< future binary compatibility
- rtm_type: libc::c_uchar, //< message type
- rtm_index: libc::c_ushort, //< index for associated ifp
- rtm_flags: libc::c_int, //< flags, incl. kern & message, e.g. DONE
- rtm_addrs: libc::c_int, //< bitmask identifying sockaddrs in msg
- rtm_pid: libc::pid_t, //< identify sender
- rtm_seq: libc::c_int, //< for sender to identify action
- rtm_errno: libc::c_int, //< why failed
- rtm_use: libc::c_int, //< from rtentry
- rtm_inits: u32, //< which metrics we are initializing
- rtm_rmx: rt_metrics, //< metrics themselves
-}
-
-#[repr(C)]
-#[allow(non_camel_case_types)]
-#[derive(Debug, Clone, Copy)]
-struct rt_msg {
- rtm: rt_msghdr,
- dst: libc::sockaddr_in,
- gateway: libc::sockaddr_dl,
- netmask: libc::sockaddr_in,
-}
-
-/// Set platform specific route configuration
-pub async fn set_route_configuration(device: &mut (dyn Device + Send)) -> io::Result<()>
-where
- Q: Read + Write,
-{
- let tun_address = match device.address() {
- Ok(t) => t,
- Err(err) => {
- error!("tun device doesn't have address, error: {}", err);
- return Err(io::Error::new(ErrorKind::Other, err));
- }
- };
-
- let tun_netmask = match device.netmask() {
- Ok(m) => m,
- Err(err) => {
- error!("tun device doesn't have netmask, error: {}", err);
- return Err(io::Error::new(ErrorKind::Other, err));
- }
- };
-
- let tun_name = match device.name() {
- Ok(n) => n,
- Err(err) => match err {
- TunError::Io(err) => return Err(err),
- e => return Err(io::Error::new(ErrorKind::Other, e)),
- },
- };
-
- // routing packets that saddr & daddr are in the subnet of the Tun interface
- //
- // This is only required for the TCP tunnel, and it is the default behavior on Linux
- //
- // https://opensource.apple.com/source/network_cmds/network_cmds-307.0.1/route.tproj/route.c.auto.html
-
- unsafe {
- let mut rtmsg: rt_msg = mem::zeroed();
- rtmsg.rtm.rtm_type = libc::RTM_ADD as libc::c_uchar;
- rtmsg.rtm.rtm_flags = libc::RTF_UP | libc::RTF_STATIC;
- rtmsg.rtm.rtm_version = libc::RTM_VERSION as libc::c_uchar;
- rtmsg.rtm.rtm_seq = rand::random();
- rtmsg.rtm.rtm_addrs = libc::RTA_DST | libc::RTA_GATEWAY | libc::RTA_NETMASK;
- rtmsg.rtm.rtm_msglen = mem::size_of_val(&rtmsg) as libc::c_ushort;
- rtmsg.rtm.rtm_pid = libc::getpid();
-
- // Set address as destination addr
- {
- rtmsg.dst.sin_family = libc::AF_INET as libc::sa_family_t;
- rtmsg.dst.sin_addr = libc::in_addr {
- s_addr: u32::from_ne_bytes(tun_address.octets()),
- };
- rtmsg.dst.sin_len = mem::size_of_val(&rtmsg.dst) as u8;
- }
-
- // Get the interface's link address (sockaddr_dl)
- let found_gateway = {
- let mut found_ifaddr = false;
-
- let mut ifap: *mut libc::ifaddrs = ptr::null_mut();
- if libc::getifaddrs(&mut ifap) != 0 {
- return Err(io::Error::last_os_error());
- }
-
- let mut ifa = ifap;
- while !ifa.is_null() {
- if !(*ifa).ifa_addr.is_null() && (*(*ifa).ifa_addr).sa_family as i32 == libc::AF_LINK {
- let ifa_name = CStr::from_ptr((*ifa).ifa_name);
- if ifa_name.to_bytes() == tun_name.as_bytes() {
- // Found the link_addr of tun interface.
-
- let sdl: *mut libc::sockaddr_dl = (*ifa).ifa_addr as *mut _;
- rtmsg.gateway = *sdl;
-
- found_ifaddr = true;
- break;
- }
- }
-
- ifa = (*ifa).ifa_next;
- }
- libc::freeifaddrs(ifap);
-
- found_ifaddr
- };
-
- if !found_gateway {
- error!("couldn't get interface \"{}\" AF_LINK address", tun_name);
- return Err(io::Error::new(
- ErrorKind::Other,
- "couldn't get interface AF_LINK address",
- ));
- }
-
- // netmask
- {
- rtmsg.netmask.sin_family = libc::AF_INET as libc::sa_family_t;
- rtmsg.netmask.sin_addr = libc::in_addr {
- s_addr: u32::from_ne_bytes(tun_netmask.octets()),
- };
- rtmsg.netmask.sin_len = mem::size_of_val(&rtmsg.netmask) as u8;
- }
-
- trace!("add route {:?}", rtmsg);
-
- let fd = libc::socket(libc::PF_ROUTE, libc::SOCK_RAW, 0);
- if fd < 0 {
- return Err(io::Error::last_os_error());
- }
-
- let n = libc::write(fd, &mut rtmsg as *mut _ as *mut _, mem::size_of_val(&rtmsg));
- if n < 0 {
- let err = io::Error::last_os_error();
- libc::close(fd);
- return Err(err);
- }
-
- libc::close(fd);
- }
-
- Ok(())
-}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/apple/mod.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/apple/mod.rs
deleted file mode 100644
index 3aab8bf0bd..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/apple/mod.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use std::{
- io::{self, ErrorKind, IoSlice},
- marker::Unpin,
-};
-
-use cfg_if::cfg_if;
-use tokio::io::{AsyncWrite, AsyncWriteExt};
-
-cfg_if! {
- if #[cfg(target_os = "macos")] {
- mod macos;
- pub use self::macos::*;
- } else {
- mod others;
- pub use self::others::*;
- }
-}
-
-/// Packet Information length in bytes
-pub const IFF_PI_PREFIX_LEN: usize = 4;
-
-/// Prepending Packet Information
-///
-/// ```
-/// +--------+--------+--------+--------+
-/// | Flags (0) | Protocol |
-/// +--------+--------+--------+--------+
-/// ```
-pub async fn write_packet_with_pi(writer: &mut W, packet: &[u8]) -> io::Result<()> {
- if packet.is_empty() {
- return Err(io::Error::new(ErrorKind::InvalidInput, "empty packet"));
- }
-
- let mut header = [0u8; 4];
-
- // Protocol, infer from the original packet
- let protocol = match packet[0] >> 4 {
- 4 => libc::PF_INET,
- 6 => libc::PF_INET6,
- _ => return Err(io::Error::new(ErrorKind::InvalidData, "neither an IPv4 or IPv6 packet")),
- };
-
- let protocol_buf = &mut header[2..];
- let protocol_bytes = (protocol as u16).to_be_bytes();
- protocol_buf.copy_from_slice(&protocol_bytes);
-
- let bufs = [IoSlice::new(&header), IoSlice::new(packet)];
- let n = writer.write_vectored(&bufs).await?;
-
- // Packets must be written together with the header
- if n != header.len() + packet.len() {
- return Err(io::Error::new(
- ErrorKind::Other,
- format!(
- "write_vectored header {} bytes, packet {} bytes, but sent {} bytes",
- header.len(),
- packet.len(),
- n
- ),
- ));
- }
-
- Ok(())
-}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/apple/others.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/apple/others.rs
deleted file mode 100644
index d74444b2cb..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/apple/others.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use std::io::{self, Read, Write};
-
-use tun::Device;
-
-/// Set platform specific route configuration
-pub async fn set_route_configuration(_: &mut (dyn Device + Send)) -> io::Result<()>
-where
- Q: Read + Write,
-{
- Ok(())
-}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/bsd.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/bsd.rs
deleted file mode 100644
index 34e23a7c89..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/bsd.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use std::{
- io::{self, ErrorKind, IoSlice, Read, Write},
- marker::Unpin,
-};
-
-use tokio::io::{AsyncWrite, AsyncWriteExt};
-use tun::Device;
-
-/// Packet Information length in bytes
-pub const IFF_PI_PREFIX_LEN: usize = 4;
-
-/// Prepending Packet Information
-///
-/// ```
-/// +--------+--------+--------+--------+
-/// | Flags (0) | Protocol |
-/// +--------+--------+--------+--------+
-/// ```
-pub async fn write_packet_with_pi(writer: &mut W, packet: &[u8]) -> io::Result<()> {
- if packet.is_empty() {
- return Err(io::Error::new(ErrorKind::InvalidInput, "empty packet"));
- }
-
- let mut header = [0u8; 4];
-
- // Protocol, infer from the original packet
- let protocol = match packet[0] >> 4 {
- 4 => libc::PF_INET,
- 6 => libc::PF_INET6,
- _ => return Err(io::Error::new(ErrorKind::InvalidData, "neither an IPv4 or IPv6 packet")),
- };
-
- let protocol_buf = &mut header[2..];
- let protocol_bytes = (protocol as u16).to_be_bytes();
- protocol_buf.copy_from_slice(&protocol_bytes);
-
- let bufs = [IoSlice::new(&header), IoSlice::new(packet)];
- let n = writer.write_vectored(&bufs).await?;
-
- // Packets must be written together with the header
- if n != header.len() + packet.len() {
- return Err(io::Error::new(
- ErrorKind::Other,
- format!(
- "write_vectored header {} bytes, packet {} bytes, but sent {} bytes",
- header.len(),
- packet.len(),
- n
- ),
- ));
- }
-
- Ok(())
-}
-
-/// Set platform specific route configuration
-pub async fn set_route_configuration(_: &mut (dyn Device + Send)) -> io::Result<()>
-where
- Q: Read + Write,
-{
- Ok(())
-}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/linux.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/linux.rs
deleted file mode 100644
index 58fa8185fa..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/linux.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::{
- io::{self, Read, Write},
- marker::Unpin,
-};
-
-use tokio::io::{AsyncWrite, AsyncWriteExt};
-use tun::Device;
-
-/// Packet Information length in bytes
-///
-/// Tun device have set `IFF_NO_PI`, so ther is no prefix headers
-pub const IFF_PI_PREFIX_LEN: usize = 0;
-
-/// Writing packet with packet information
-///
-/// Tun device have set `IFF_NO_PI`, so there is nothing to prepend on Linux
-pub async fn write_packet_with_pi(writer: &mut W, packet: &[u8]) -> io::Result<()> {
- writer.write_all(packet).await
-}
-
-/// Set platform specific route configuration
-pub async fn set_route_configuration(_: &mut (dyn Device + Send)) -> io::Result<()>
-where
- Q: Read + Write,
-{
- Ok(())
-}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/mod.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/mod.rs
deleted file mode 100644
index fce535d6cf..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/mod.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use cfg_if::cfg_if;
-
-cfg_if! {
- if #[cfg(any(target_os = "linux"))] {
- mod linux;
- pub use self::linux::*;
- } else if #[cfg(target_vendor = "apple")] {
- mod apple;
- pub use self::apple::*;
- } else if #[cfg(any(target_os = "freebsd", target_os = "openbsd"))] {
- mod bsd;
- pub use self::bsd::*;
- } else if #[cfg(target_os = "android")] {
- mod android;
- pub use self::android::*;
- } else {
- mod others;
- pub use self::others::*;
- }
-}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/others.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/others.rs
deleted file mode 100644
index fb966718fb..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/unix/others.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::{
- io::{self, Read, Write},
- marker::Unpin,
-};
-
-use tokio::io::{AsyncWrite, AsyncWriteExt};
-use tun::Device;
-
-/// Packet Information length in bytes
-pub const IFF_PI_PREFIX_LEN: usize = 0;
-
-/// Writing packet with packet information
-pub async fn write_packet_with_pi(writer: &mut W, packet: &[u8]) -> io::Result<()> {
- writer.write_all(packet).await
-}
-
-/// Set platform specific route configuration
-pub async fn set_route_configuration(_: &mut (dyn Device + Send)) -> io::Result<()>
-where
- Q: Read + Write,
-{
- Ok(())
-}
diff --git a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/windows/mod.rs b/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/windows/mod.rs
deleted file mode 100644
index 62f48860c0..0000000000
--- a/shadowsocks-rust/crates/shadowsocks-service/src/local/tun/sys/windows/mod.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::{
- io::{self, Read, Write},
- marker::Unpin,
-};
-
-use tokio::io::{AsyncWrite, AsyncWriteExt};
-use tun::Device;
-
-/// Packet Information length in bytes
-///
-/// Tun device on Windows (https://wintun.net) doesn't have Packet Information header, so there is no prefix headers
-pub const IFF_PI_PREFIX_LEN: usize = 0;
-
-/// Writing packet with packet information
-///
-/// Tun device on Windows (https://wintun.net) doesn't have Packet Information header, so there is nothing to prepend on Windows
-pub async fn write_packet_with_pi(writer: &mut W, packet: &[u8]) -> io::Result<()> {
- writer.write_all(packet).await
-}
-
-/// Set platform specific route configuration
-pub async fn set_route_configuration(_: &mut (dyn Device + Send)) -> io::Result<()>
-where
- Q: Read + Write,
-{
- Ok(())
-}
diff --git a/shadowsocks-rust/debian/changelog b/shadowsocks-rust/debian/changelog
index 6b67143033..f568f7cd28 100644
--- a/shadowsocks-rust/debian/changelog
+++ b/shadowsocks-rust/debian/changelog
@@ -1,3 +1,20 @@
+shadowsocks-rust (1.19.2) unstable; urgency=medium
+
+ ## Bug Fixes
+
+ - `local-tun`: `tun2` handles IP packet information automatically.
+
+shadowsocks-rust (1.19.1) unstable; urgency=medium
+
+ ## Features
+
+ - Rollback `rustls` to v0.22, v0.23 first introduced `aws-lc` as the default crypto implementation, but it cannot be built on some targets if there are still older versions of `rustls` in the dependency tree.
+ - `local-tun`: Switch from `tun` to `tun2`, which is a fork of `tun`. `tun` seems to be abandoned.
+
+ ## Bug Fixes
+
+ - #1539 `local-fake-dns`: Query Response Message has to include the original Query and flags.
+
shadowsocks-rust (1.19.0) unstable; urgency=medium
## Features
diff --git a/shadowsocks-rust/docker/linux-cross/Dockerfile b/shadowsocks-rust/docker/linux-cross/Dockerfile
new file mode 100644
index 0000000000..5f17c9a5e8
--- /dev/null
+++ b/shadowsocks-rust/docker/linux-cross/Dockerfile
@@ -0,0 +1,11 @@
+ARG CROSS_BASE_IMAGE
+FROM $CROSS_BASE_IMAGE
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+ apt-get install --assume-yes --no-install-recommends build-essential cmake nasm llvm-8-dev libclang-8-dev clang-8 && \
+ git config --global --add safe.directory '*' && \
+ rm -rf /tmp/*
+
+ENV GOCACHE=/tmp
diff --git a/sing-box/common/settings/proxy_linux.go b/sing-box/common/settings/proxy_linux.go
index 4211b2f88d..84e27b123b 100644
--- a/sing-box/common/settings/proxy_linux.go
+++ b/sing-box/common/settings/proxy_linux.go
@@ -16,30 +16,40 @@ import (
)
type LinuxSystemProxy struct {
- hasGSettings bool
- hasKWriteConfig5 bool
- sudoUser string
- serverAddr M.Socksaddr
- supportSOCKS bool
- isEnabled bool
+ hasGSettings bool
+ kWriteConfigCmd string
+ sudoUser string
+ serverAddr M.Socksaddr
+ supportSOCKS bool
+ isEnabled bool
}
func NewSystemProxy(ctx context.Context, serverAddr M.Socksaddr, supportSOCKS bool) (*LinuxSystemProxy, error) {
hasGSettings := common.Error(exec.LookPath("gsettings")) == nil
- hasKWriteConfig5 := common.Error(exec.LookPath("kwriteconfig5")) == nil
+ kWriteConfigCmds := []string{
+ "kwriteconfig5",
+ "kwriteconfig6",
+ }
+ var kWriteConfigCmd string
+ for _, cmd := range kWriteConfigCmds {
+ if common.Error(exec.LookPath(cmd)) == nil {
+ kWriteConfigCmd = cmd
+ break
+ }
+ }
var sudoUser string
if os.Getuid() == 0 {
sudoUser = os.Getenv("SUDO_USER")
}
- if !hasGSettings && !hasKWriteConfig5 {
+ if !hasGSettings && kWriteConfigCmd == "" {
return nil, E.New("unsupported desktop environment")
}
return &LinuxSystemProxy{
- hasGSettings: hasGSettings,
- hasKWriteConfig5: hasKWriteConfig5,
- sudoUser: sudoUser,
- serverAddr: serverAddr,
- supportSOCKS: supportSOCKS,
+ hasGSettings: hasGSettings,
+ kWriteConfigCmd: kWriteConfigCmd,
+ sudoUser: sudoUser,
+ serverAddr: serverAddr,
+ supportSOCKS: supportSOCKS,
}, nil
}
@@ -70,8 +80,8 @@ func (p *LinuxSystemProxy) Enable() error {
return err
}
}
- if p.hasKWriteConfig5 {
- err := p.runAsUser("kwriteconfig5", "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "1")
+ if p.kWriteConfigCmd != "" {
+ err := p.runAsUser(p.kWriteConfigCmd, "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "1")
if err != nil {
return err
}
@@ -83,7 +93,7 @@ func (p *LinuxSystemProxy) Enable() error {
if err != nil {
return err
}
- err = p.runAsUser("kwriteconfig5", "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "Authmode", "0")
+ err = p.runAsUser(p.kWriteConfigCmd, "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "Authmode", "0")
if err != nil {
return err
}
@@ -103,8 +113,8 @@ func (p *LinuxSystemProxy) Disable() error {
return err
}
}
- if p.hasKWriteConfig5 {
- err := p.runAsUser("kwriteconfig5", "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0")
+ if p.kWriteConfigCmd != "" {
+ err := p.runAsUser(p.kWriteConfigCmd, "--file", "kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0")
if err != nil {
return err
}
@@ -150,7 +160,7 @@ func (p *LinuxSystemProxy) setKDEProxy(proxyTypes ...string) error {
proxyUrl = "http://" + p.serverAddr.String()
}
err := p.runAsUser(
- "kwriteconfig5",
+ p.kWriteConfigCmd,
"--file",
"kioslaverc",
"--group",
diff --git a/sing-box/docs/changelog.md b/sing-box/docs/changelog.md
index 4c5b129a29..295e0a8840 100644
--- a/sing-box/docs/changelog.md
+++ b/sing-box/docs/changelog.md
@@ -2,6 +2,10 @@
icon: material/alert-decagram
---
+#### 1.10.0-alpha.7
+
+* Fixes and improvements
+
#### 1.10.0-alpha.5
* Improve auto-redirect **1**
diff --git a/sing-box/go.mod b/sing-box/go.mod
index daaee0d6b9..ffdcf9e26b 100644
--- a/sing-box/go.mod
+++ b/sing-box/go.mod
@@ -24,17 +24,16 @@ require (
github.com/sagernet/cloudflare-tls v0.0.0-20231208171750-a4483c1b7cd1
github.com/sagernet/gomobile v0.1.3
github.com/sagernet/gvisor v0.0.0-20240428053021-e691de28565f
- github.com/sagernet/nftables v0.3.0-beta.2
github.com/sagernet/quic-go v0.43.1-beta.1
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691
- github.com/sagernet/sing v0.5.0-alpha.7
- github.com/sagernet/sing-dns v0.2.0-beta.18
+ github.com/sagernet/sing v0.5.0-alpha.8
+ github.com/sagernet/sing-dns v0.3.0-beta.1
github.com/sagernet/sing-mux v0.2.0
github.com/sagernet/sing-quic v0.2.0-beta.5
github.com/sagernet/sing-shadowsocks v0.2.6
github.com/sagernet/sing-shadowsocks2 v0.2.0
github.com/sagernet/sing-shadowtls v0.1.4
- github.com/sagernet/sing-tun v0.4.0-beta.4
+ github.com/sagernet/sing-tun v0.4.0-beta.6
github.com/sagernet/sing-vmess v0.1.8
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7
github.com/sagernet/tfo-go v0.0.0-20231209031829-7b5343ac1dc6
@@ -46,7 +45,6 @@ require (
go.uber.org/zap v1.27.0
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
golang.org/x/crypto v0.23.0
- golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
golang.org/x/net v0.25.0
golang.org/x/sys v0.20.0
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6
@@ -83,11 +81,13 @@ require (
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
github.com/sagernet/netlink v0.0.0-20240523065131-45e60152f9ba // indirect
+ github.com/sagernet/nftables v0.3.0-beta.2 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/u-root/uio v0.0.0-20230220225925-ffce2a382923 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
github.com/zeebo/blake3 v0.2.3 // indirect
go.uber.org/multierr v1.11.0 // indirect
+ golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/text v0.15.0 // indirect
diff --git a/sing-box/go.sum b/sing-box/go.sum
index ba83799dde..097e3faea7 100644
--- a/sing-box/go.sum
+++ b/sing-box/go.sum
@@ -108,10 +108,10 @@ github.com/sagernet/quic-go v0.43.1-beta.1/go.mod h1:BkrQYeop7Jx3hN3TW8/76CXcdhY
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byLGkEnIYp6grlXfo1QYUfiYFGjewIdc=
github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU=
github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo=
-github.com/sagernet/sing v0.5.0-alpha.7 h1:yxjiH0vQAotu87JNJ9B0BGO0OJqsFjug84xcYdwyDm4=
-github.com/sagernet/sing v0.5.0-alpha.7/go.mod h1:Xh4KO9nGdvm4K/LVg9Xn9jSxJdqe9KcXbAzNC1S2qfw=
-github.com/sagernet/sing-dns v0.2.0-beta.18 h1:6vzXZThRdA7YUzBOpSbUT48XRumtl/KIpIHFSOP0za8=
-github.com/sagernet/sing-dns v0.2.0-beta.18/go.mod h1:k/dmFcQpg6+m08gC1yQBy+13+QkuLqpKr4bIreq4U24=
+github.com/sagernet/sing v0.5.0-alpha.8 h1:2KtzBvKP6hwknsi/G6H4vRgR4it31HQ6quLb0Woze7c=
+github.com/sagernet/sing v0.5.0-alpha.8/go.mod h1:Xh4KO9nGdvm4K/LVg9Xn9jSxJdqe9KcXbAzNC1S2qfw=
+github.com/sagernet/sing-dns v0.3.0-beta.1 h1:ZARhK79eWYckWcGtYBLIT68LnwfbdE2EojkpIpoPGlc=
+github.com/sagernet/sing-dns v0.3.0-beta.1/go.mod h1:k/dmFcQpg6+m08gC1yQBy+13+QkuLqpKr4bIreq4U24=
github.com/sagernet/sing-mux v0.2.0 h1:4C+vd8HztJCWNYfufvgL49xaOoOHXty2+EAjnzN3IYo=
github.com/sagernet/sing-mux v0.2.0/go.mod h1:khzr9AOPocLa+g53dBplwNDz4gdsyx/YM3swtAhlkHQ=
github.com/sagernet/sing-quic v0.2.0-beta.5 h1:ceKFLd1iS5AtM+pScKmcDp5k7R6WgYIe8vl6nB0aVsE=
@@ -122,8 +122,8 @@ github.com/sagernet/sing-shadowsocks2 v0.2.0 h1:wpZNs6wKnR7mh1wV9OHwOyUr21VkS3wK
github.com/sagernet/sing-shadowsocks2 v0.2.0/go.mod h1:RnXS0lExcDAovvDeniJ4IKa2IuChrdipolPYWBv9hWQ=
github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
-github.com/sagernet/sing-tun v0.4.0-beta.4 h1:94OB9fQupn0qBPvlDzKRAq1lSIPHAvVBaw69/jEZfgQ=
-github.com/sagernet/sing-tun v0.4.0-beta.4/go.mod h1:DxLIyhjWU/HwGYoX0vNGg2c5QgTQIakphU1MuERR5tQ=
+github.com/sagernet/sing-tun v0.4.0-beta.6 h1:Ybp1Yr2iNuh9iI/+f8L6R5MkhMJEMNtRHNBdmvVq9P0=
+github.com/sagernet/sing-tun v0.4.0-beta.6/go.mod h1:X9taVYeJXEtK9v6BpS1V/gUXTwY4nQKH4iYDLX1JUXY=
github.com/sagernet/sing-vmess v0.1.8 h1:XVWad1RpTy9b5tPxdm5MCU8cGfrTGdR8qCq6HV2aCNc=
github.com/sagernet/sing-vmess v0.1.8/go.mod h1:vhx32UNzTDUkNwOyIjcZQohre1CaytquC5mPplId8uA=
github.com/sagernet/smux v0.0.0-20231208180855-7041f6ea79e7 h1:DImB4lELfQhplLTxeq2z31Fpv8CQqqrUwTbrIRumZqQ=
diff --git a/sing-box/inbound/tun.go b/sing-box/inbound/tun.go
index 2275fa068c..a0e7f5fa51 100644
--- a/sing-box/inbound/tun.go
+++ b/sing-box/inbound/tun.go
@@ -3,6 +3,7 @@ package inbound
import (
"context"
"net"
+ "os"
"strconv"
"strings"
"time"
@@ -37,7 +38,7 @@ type Tun struct {
tunStack tun.Stack
platformInterface platform.Interface
platformOptions option.TunPlatformOptions
- autoRedirect *tunAutoRedirect
+ autoRedirect tun.AutoRedirect
}
func NewTun(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.TunInboundOptions, platformInterface platform.Interface) (*Tun, error) {
@@ -105,7 +106,15 @@ func NewTun(ctx context.Context, router adapter.Router, logger log.ContextLogger
if !options.AutoRoute {
return nil, E.New("`auto_route` is required by `auto_redirect`")
}
- inbound.autoRedirect, err = newAutoRedirect(inbound)
+ disableNFTables, dErr := strconv.ParseBool(os.Getenv("DISABLE_NFTABLES"))
+ inbound.autoRedirect, err = tun.NewAutoRedirect(tun.AutoRedirectOptions{
+ TunOptions: &inbound.tunOptions,
+ Context: ctx,
+ Handler: inbound,
+ Logger: logger,
+ TableName: "sing-box",
+ DisableNFTables: dErr == nil && disableNFTables,
+ })
if err != nil {
return nil, E.Cause(err, "initialize auto redirect")
}
@@ -222,7 +231,7 @@ func (t *Tun) Close() error {
return common.Close(
t.tunStack,
t.tunIf,
- common.PtrOrNil(t.autoRedirect),
+ t.autoRedirect,
)
}
@@ -234,7 +243,11 @@ func (t *Tun) NewConnection(ctx context.Context, conn net.Conn, upstreamMetadata
metadata.Source = upstreamMetadata.Source
metadata.Destination = upstreamMetadata.Destination
metadata.InboundOptions = t.inboundOptions
- t.logger.InfoContext(ctx, "inbound connection from ", metadata.Source)
+ if upstreamMetadata.Protocol != "" {
+ t.logger.InfoContext(ctx, "inbound ", upstreamMetadata.Protocol, " connection from ", metadata.Source)
+ } else {
+ t.logger.InfoContext(ctx, "inbound connection from ", metadata.Source)
+ }
t.logger.InfoContext(ctx, "inbound connection to ", metadata.Destination)
err := t.router.RouteConnection(ctx, conn, metadata)
if err != nil {
diff --git a/sing-box/inbound/tun_auto_redirect.go b/sing-box/inbound/tun_auto_redirect.go
deleted file mode 100644
index 8ebc04d299..0000000000
--- a/sing-box/inbound/tun_auto_redirect.go
+++ /dev/null
@@ -1,197 +0,0 @@
-//go:build linux
-
-package inbound
-
-import (
- "context"
- "net"
- "net/netip"
- "os"
- "os/exec"
- "strconv"
-
- "github.com/sagernet/nftables"
- "github.com/sagernet/sing-box/adapter"
- "github.com/sagernet/sing-box/common/redir"
- C "github.com/sagernet/sing-box/constant"
- "github.com/sagernet/sing-box/option"
- "github.com/sagernet/sing-tun"
- E "github.com/sagernet/sing/common/exceptions"
- M "github.com/sagernet/sing/common/metadata"
- N "github.com/sagernet/sing/common/network"
-
- "golang.org/x/sys/unix"
-)
-
-type tunAutoRedirect struct {
- myInboundAdapter
- tunOptions *tun.Options
- enableIPv4 bool
- enableIPv6 bool
- iptablesPath string
- ip6tablesPath string
- useNfTables bool
- androidSu bool
- suPath string
-}
-
-func newAutoRedirect(t *Tun) (*tunAutoRedirect, error) {
- s := &tunAutoRedirect{
- myInboundAdapter: myInboundAdapter{
- protocol: C.TypeRedirect,
- network: []string{N.NetworkTCP},
- ctx: t.ctx,
- router: t.router,
- logger: t.logger,
- tag: t.tag,
- listenOptions: option.ListenOptions{
- InboundOptions: t.inboundOptions,
- },
- },
- tunOptions: &t.tunOptions,
- }
- s.connHandler = s
-
- if C.IsAndroid {
- s.enableIPv4 = true
- s.iptablesPath = "/system/bin/iptables"
- userId := os.Getuid()
- if userId != 0 {
- var (
- suPath string
- err error
- )
- if t.platformInterface != nil {
- suPath, err = exec.LookPath("/bin/su")
- } else {
- suPath, err = exec.LookPath("su")
- }
- if err == nil {
- s.androidSu = true
- s.suPath = suPath
- } else {
- return nil, E.Extend(E.Cause(err, "root permission is required for auto redirect"), os.Getenv("PATH"))
- }
- }
- } else {
- err := s.initializeNfTables()
- if err != nil && err != os.ErrInvalid {
- t.logger.Debug("device has no nftables support: ", err)
- }
- if len(t.tunOptions.Inet4Address) > 0 {
- s.enableIPv4 = true
- if !s.useNfTables {
- s.iptablesPath, err = exec.LookPath("iptables")
- if err != nil {
- return nil, E.Cause(err, "iptables is required")
- }
- }
- }
- if len(t.tunOptions.Inet6Address) > 0 {
- s.enableIPv6 = true
- if !s.useNfTables {
- s.ip6tablesPath, err = exec.LookPath("ip6tables")
- if err != nil {
- if !s.enableIPv4 {
- return nil, E.Cause(err, "ip6tables is required")
- } else {
- s.enableIPv6 = false
- t.logger.Error("device has no ip6tables nat support: ", err)
- }
- }
- }
- }
- }
- var listenAddr netip.Addr
- if C.IsAndroid {
- listenAddr = netip.AddrFrom4([4]byte{127, 0, 0, 1})
- } else if s.enableIPv6 {
- listenAddr = netip.IPv6Unspecified()
- } else {
- listenAddr = netip.IPv4Unspecified()
- }
- s.listenOptions.Listen = option.NewListenAddress(listenAddr)
- return s, nil
-}
-
-func (t *tunAutoRedirect) initializeNfTables() error {
- disabled, err := strconv.ParseBool(os.Getenv("AUTO_REDIRECT_DISABLE_NFTABLES"))
- if err == nil && disabled {
- return os.ErrInvalid
- }
- nft, err := nftables.New()
- if err != nil {
- return err
- }
- defer nft.CloseLasting()
- _, err = nft.ListTablesOfFamily(unix.AF_INET)
- if err != nil {
- return err
- }
- t.useNfTables = true
- return nil
-}
-
-func (t *tunAutoRedirect) Start() error {
- err := t.myInboundAdapter.Start()
- if err != nil {
- return E.Cause(err, "start redirect server")
- }
- t.cleanupTables()
- err = t.setupTables()
- if err != nil {
- return err
- }
- return nil
-}
-
-func (t *tunAutoRedirect) Close() error {
- t.cleanupTables()
- return t.myInboundAdapter.Close()
-}
-
-func (t *tunAutoRedirect) NewConnection(ctx context.Context, conn net.Conn, metadata adapter.InboundContext) error {
- destination, err := redir.GetOriginalDestination(conn)
- if err != nil {
- return E.Cause(err, "get redirect destination")
- }
- metadata.Destination = M.SocksaddrFromNetIP(destination)
- return t.newConnection(ctx, conn, metadata)
-}
-
-func (t *tunAutoRedirect) setupTables() error {
- var setupTables func(int) error
- if t.useNfTables {
- setupTables = t.setupNfTables
- } else {
- setupTables = t.setupIPTables
- }
- if t.enableIPv4 {
- err := setupTables(unix.AF_INET)
- if err != nil {
- return err
- }
- }
- if t.enableIPv6 {
- err := setupTables(unix.AF_INET6)
- if err != nil {
- return err
- }
- }
- return nil
-}
-
-func (t *tunAutoRedirect) cleanupTables() {
- var cleanupTables func(int)
- if t.useNfTables {
- cleanupTables = t.cleanupNfTables
- } else {
- cleanupTables = t.cleanupIPTables
- }
- if t.enableIPv4 {
- cleanupTables(unix.AF_INET)
- }
- if t.enableIPv6 {
- cleanupTables(unix.AF_INET6)
- }
-}
diff --git a/sing-box/inbound/tun_auto_redirect_iptables.go b/sing-box/inbound/tun_auto_redirect_iptables.go
deleted file mode 100644
index b1aa7dff13..0000000000
--- a/sing-box/inbound/tun_auto_redirect_iptables.go
+++ /dev/null
@@ -1,235 +0,0 @@
-//go:build linux
-
-package inbound
-
-import (
- "net/netip"
- "os/exec"
- "strings"
-
- E "github.com/sagernet/sing/common/exceptions"
- F "github.com/sagernet/sing/common/format"
- M "github.com/sagernet/sing/common/metadata"
-
- "golang.org/x/sys/unix"
-)
-
-const (
- iptablesTableNameOutput = "sing-box-output"
- iptablesTableNameForward = "sing-box-forward"
- iptablesTableNamePreRouteing = "sing-box-prerouting"
-)
-
-func (t *tunAutoRedirect) iptablesPathForFamily(family int) string {
- if family == unix.AF_INET {
- return t.iptablesPath
- } else {
- return t.ip6tablesPath
- }
-}
-
-func (t *tunAutoRedirect) setupIPTables(family int) error {
- iptablesPath := t.iptablesPathForFamily(family)
- // OUTPUT
- err := t.runShell(iptablesPath, "-t nat -N", iptablesTableNameOutput)
- if err != nil {
- return err
- }
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNameOutput,
- "-p tcp -o", t.tunOptions.Name,
- "-j REDIRECT --to-ports", M.AddrPortFromNet(t.tcpListener.Addr()).Port())
- if err != nil {
- return err
- }
- err = t.runShell(iptablesPath, "-t nat -I OUTPUT -j", iptablesTableNameOutput)
- if err != nil {
- return err
- }
- if !t.androidSu {
- // FORWARD
- err = t.runShell(iptablesPath, "-N", iptablesTableNameForward)
- if err != nil {
- return err
- }
- err = t.runShell(iptablesPath, "-A", iptablesTableNameForward,
- "-i", t.tunOptions.Name, "-j", "ACCEPT")
- if err != nil {
- return err
- }
- err = t.runShell(iptablesPath, "-A", iptablesTableNameForward,
- "-o", t.tunOptions.Name, "-j", "ACCEPT")
- if err != nil {
- return err
- }
- err = t.runShell(iptablesPath, "-I FORWARD -j", iptablesTableNameForward)
- if err != nil {
- return err
- }
- // PREROUTING
- err = t.setupIPTablesPreRouting(family)
- if err != nil {
- return err
- }
- }
- return nil
-}
-
-func (t *tunAutoRedirect) setupIPTablesPreRouting(family int) error {
- iptablesPath := t.iptablesPathForFamily(family)
- err := t.runShell(iptablesPath, "-t nat -N", iptablesTableNamePreRouteing)
- if err != nil {
- return err
- }
- var (
- routeAddress []netip.Prefix
- routeExcludeAddress []netip.Prefix
- )
- if family == unix.AF_INET {
- routeAddress = t.tunOptions.Inet4RouteAddress
- routeExcludeAddress = t.tunOptions.Inet4RouteExcludeAddress
- } else {
- routeAddress = t.tunOptions.Inet6RouteAddress
- routeExcludeAddress = t.tunOptions.Inet6RouteExcludeAddress
- }
- if len(routeAddress) > 0 && (len(t.tunOptions.IncludeInterface) > 0 || len(t.tunOptions.IncludeUID) > 0) {
- return E.New("`*_route_address` is conflict with `include_interface` or `include_uid`")
- }
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-i", t.tunOptions.Name, "-j RETURN")
- if err != nil {
- return err
- }
- for _, address := range routeExcludeAddress {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-d", address.String(), "-j RETURN")
- if err != nil {
- return err
- }
- }
- for _, name := range t.tunOptions.ExcludeInterface {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-i", name, "-j RETURN")
- if err != nil {
- return err
- }
- }
- for _, uid := range t.tunOptions.ExcludeUID {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-m owner --uid-owner", uid, "-j RETURN")
- if err != nil {
- return err
- }
- }
- var dnsServerAddress netip.Addr
- if family == unix.AF_INET {
- dnsServerAddress = t.tunOptions.Inet4Address[0].Addr().Next()
- } else {
- dnsServerAddress = t.tunOptions.Inet6Address[0].Addr().Next()
- }
- if len(routeAddress) > 0 {
- for _, address := range routeAddress {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-d", address.String(), "-p udp --dport 53 -j DNAT --to", dnsServerAddress)
- if err != nil {
- return err
- }
- }
- } else if len(t.tunOptions.IncludeInterface) > 0 || len(t.tunOptions.IncludeUID) > 0 {
- for _, name := range t.tunOptions.IncludeInterface {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-i", name, "-p udp --dport 53 -j DNAT --to", dnsServerAddress)
- if err != nil {
- return err
- }
- }
- for _, uidRange := range t.tunOptions.IncludeUID {
- for uid := uidRange.Start; uid <= uidRange.End; uid++ {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-m owner --uid-owner", uid, "-p udp --dport 53 -j DNAT --to", dnsServerAddress)
- if err != nil {
- return err
- }
- }
- }
- } else {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-p udp --dport 53 -j DNAT --to", dnsServerAddress)
- if err != nil {
- return err
- }
- }
-
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing, "-m addrtype --dst-type LOCAL -j RETURN")
- if err != nil {
- return err
- }
-
- if len(routeAddress) > 0 {
- for _, address := range routeAddress {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-d", address.String(), "-p tcp -j REDIRECT --to-ports", M.AddrPortFromNet(t.tcpListener.Addr()).Port())
- if err != nil {
- return err
- }
- }
- } else if len(t.tunOptions.IncludeInterface) > 0 || len(t.tunOptions.IncludeUID) > 0 {
- for _, name := range t.tunOptions.IncludeInterface {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-i", name, "-p tcp -j REDIRECT --to-ports", M.AddrPortFromNet(t.tcpListener.Addr()).Port())
- if err != nil {
- return err
- }
- }
- for _, uidRange := range t.tunOptions.IncludeUID {
- for uid := uidRange.Start; uid <= uidRange.End; uid++ {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-m owner --uid-owner", uid, "-p tcp -j REDIRECT --to-ports", M.AddrPortFromNet(t.tcpListener.Addr()).Port())
- if err != nil {
- return err
- }
- }
- }
- } else {
- err = t.runShell(iptablesPath, "-t nat -A", iptablesTableNamePreRouteing,
- "-p tcp -j REDIRECT --to-ports", M.AddrPortFromNet(t.tcpListener.Addr()).Port())
- if err != nil {
- return err
- }
- }
- err = t.runShell(iptablesPath, "-t nat -I PREROUTING -j", iptablesTableNamePreRouteing)
- if err != nil {
- return err
- }
- return nil
-}
-
-func (t *tunAutoRedirect) cleanupIPTables(family int) {
- iptablesPath := t.iptablesPathForFamily(family)
- _ = t.runShell(iptablesPath, "-t nat -D OUTPUT -j", iptablesTableNameOutput)
- _ = t.runShell(iptablesPath, "-t nat -F", iptablesTableNameOutput)
- _ = t.runShell(iptablesPath, "-t nat -X", iptablesTableNameOutput)
- if !t.androidSu {
- _ = t.runShell(iptablesPath, "-D FORWARD -j", iptablesTableNameForward)
- _ = t.runShell(iptablesPath, "-F", iptablesTableNameForward)
- _ = t.runShell(iptablesPath, "-X", iptablesTableNameForward)
- _ = t.runShell(iptablesPath, "-t nat -D PREROUTING -j", iptablesTableNamePreRouteing)
- _ = t.runShell(iptablesPath, "-t nat -F", iptablesTableNamePreRouteing)
- _ = t.runShell(iptablesPath, "-t nat -X", iptablesTableNamePreRouteing)
- }
-}
-
-func (t *tunAutoRedirect) runShell(commands ...any) error {
- commandStr := strings.Join(F.MapToString(commands), " ")
- var command *exec.Cmd
- if t.androidSu {
- command = exec.Command(t.suPath, "-c", commandStr)
- } else {
- commandArray := strings.Split(commandStr, " ")
- command = exec.Command(commandArray[0], commandArray[1:]...)
- }
- combinedOutput, err := command.CombinedOutput()
- if err != nil {
- return E.Extend(err, F.ToString(commandStr, ": ", string(combinedOutput)))
- }
- return nil
-}
diff --git a/sing-box/inbound/tun_auto_redirect_nftables.go b/sing-box/inbound/tun_auto_redirect_nftables.go
deleted file mode 100644
index ed84adf4c6..0000000000
--- a/sing-box/inbound/tun_auto_redirect_nftables.go
+++ /dev/null
@@ -1,231 +0,0 @@
-//go:build linux
-
-package inbound
-
-import (
- "net/netip"
-
- "github.com/sagernet/nftables"
- "github.com/sagernet/nftables/binaryutil"
- "github.com/sagernet/nftables/expr"
- F "github.com/sagernet/sing/common/format"
- M "github.com/sagernet/sing/common/metadata"
-
- "golang.org/x/sys/unix"
-)
-
-const (
- nftablesTableName = "sing-box"
- nftablesChainOutput = "output"
- nftablesChainForward = "forward"
- nftablesChainPreRouting = "prerouting"
-)
-
-func nftablesFamily(family int) nftables.TableFamily {
- switch family {
- case unix.AF_INET:
- return nftables.TableFamilyIPv4
- case unix.AF_INET6:
- return nftables.TableFamilyIPv6
- default:
- panic(F.ToString("unknown family ", family))
- }
-}
-
-func (t *tunAutoRedirect) setupNfTables(family int) error {
- nft, err := nftables.New()
- if err != nil {
- return err
- }
- defer nft.CloseLasting()
- table := nft.AddTable(&nftables.Table{
- Name: nftablesTableName,
- Family: nftablesFamily(family),
- })
- chainOutput := nft.AddChain(&nftables.Chain{
- Name: nftablesChainOutput,
- Table: table,
- Hooknum: nftables.ChainHookOutput,
- Priority: nftables.ChainPriorityMangle,
- Type: nftables.ChainTypeNAT,
- })
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainOutput,
- Exprs: nftablesRuleIfName(expr.MetaKeyOIFNAME, t.tunOptions.Name, nftablesRuleRedirectToPorts(M.AddrPortFromNet(t.tcpListener.Addr()).Port())...),
- })
- chainForward := nft.AddChain(&nftables.Chain{
- Name: nftablesChainForward,
- Table: table,
- Hooknum: nftables.ChainHookForward,
- Priority: nftables.ChainPriorityMangle,
- })
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainForward,
- Exprs: nftablesRuleIfName(expr.MetaKeyIIFNAME, t.tunOptions.Name, &expr.Verdict{
- Kind: expr.VerdictAccept,
- }),
- })
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainForward,
- Exprs: nftablesRuleIfName(expr.MetaKeyOIFNAME, t.tunOptions.Name, &expr.Verdict{
- Kind: expr.VerdictAccept,
- }),
- })
- t.setupNfTablesPreRouting(nft, table)
- return nft.Flush()
-}
-
-func (t *tunAutoRedirect) setupNfTablesPreRouting(nft *nftables.Conn, table *nftables.Table) {
- chainPreRouting := nft.AddChain(&nftables.Chain{
- Name: nftablesChainPreRouting,
- Table: table,
- Hooknum: nftables.ChainHookPrerouting,
- Priority: nftables.ChainPriorityMangle,
- Type: nftables.ChainTypeNAT,
- })
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: nftablesRuleIfName(expr.MetaKeyIIFNAME, t.tunOptions.Name, &expr.Verdict{
- Kind: expr.VerdictReturn,
- }),
- })
- var (
- routeAddress []netip.Prefix
- routeExcludeAddress []netip.Prefix
- )
- if table.Family == nftables.TableFamilyIPv4 {
- routeAddress = t.tunOptions.Inet4RouteAddress
- routeExcludeAddress = t.tunOptions.Inet4RouteExcludeAddress
- } else {
- routeAddress = t.tunOptions.Inet6RouteAddress
- routeExcludeAddress = t.tunOptions.Inet6RouteExcludeAddress
- }
- for _, address := range routeExcludeAddress {
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: nftablesRuleDestinationAddress(address, &expr.Verdict{
- Kind: expr.VerdictReturn,
- }),
- })
- }
- for _, name := range t.tunOptions.ExcludeInterface {
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: nftablesRuleIfName(expr.MetaKeyIIFNAME, name, &expr.Verdict{
- Kind: expr.VerdictReturn,
- }),
- })
- }
- for _, uidRange := range t.tunOptions.ExcludeUID {
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: nftablesRuleMetaUInt32Range(expr.MetaKeySKUID, uidRange, &expr.Verdict{
- Kind: expr.VerdictReturn,
- }),
- })
- }
-
- var routeExprs []expr.Any
- if len(routeAddress) > 0 {
- for _, address := range routeAddress {
- routeExprs = append(routeExprs, nftablesRuleDestinationAddress(address)...)
- }
- }
- redirectPort := M.AddrPortFromNet(t.tcpListener.Addr()).Port()
- var dnsServerAddress netip.Addr
- if table.Family == nftables.TableFamilyIPv4 {
- dnsServerAddress = t.tunOptions.Inet4Address[0].Addr().Next()
- } else {
- dnsServerAddress = t.tunOptions.Inet6Address[0].Addr().Next()
- }
-
- if len(t.tunOptions.IncludeInterface) > 0 || len(t.tunOptions.IncludeUID) > 0 {
- for _, name := range t.tunOptions.IncludeInterface {
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: nftablesRuleIfName(expr.MetaKeyIIFNAME, name, append(routeExprs, nftablesRuleHijackDNS(table.Family, dnsServerAddress)...)...),
- })
- }
- for _, uidRange := range t.tunOptions.IncludeUID {
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: nftablesRuleMetaUInt32Range(expr.MetaKeySKUID, uidRange, append(routeExprs, nftablesRuleHijackDNS(table.Family, dnsServerAddress)...)...),
- })
- }
- } else {
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: append(routeExprs, nftablesRuleHijackDNS(table.Family, dnsServerAddress)...),
- })
- }
-
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: []expr.Any{
- &expr.Fib{
- Register: 1,
- FlagDADDR: true,
- ResultADDRTYPE: true,
- },
- &expr.Cmp{
- Op: expr.CmpOpEq,
- Register: 1,
- Data: binaryutil.NativeEndian.PutUint32(unix.RTN_LOCAL),
- },
- &expr.Verdict{
- Kind: expr.VerdictReturn,
- },
- },
- })
-
- if len(t.tunOptions.IncludeInterface) > 0 || len(t.tunOptions.IncludeUID) > 0 {
- for _, name := range t.tunOptions.IncludeInterface {
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: nftablesRuleIfName(expr.MetaKeyIIFNAME, name, append(routeExprs, nftablesRuleRedirectToPorts(redirectPort)...)...),
- })
- }
- for _, uidRange := range t.tunOptions.IncludeUID {
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: nftablesRuleMetaUInt32Range(expr.MetaKeySKUID, uidRange, append(routeExprs, nftablesRuleRedirectToPorts(redirectPort)...)...),
- })
- }
- } else {
- nft.AddRule(&nftables.Rule{
- Table: table,
- Chain: chainPreRouting,
- Exprs: append(routeExprs, nftablesRuleRedirectToPorts(redirectPort)...),
- })
- }
-}
-
-func (t *tunAutoRedirect) cleanupNfTables(family int) {
- conn, err := nftables.New()
- if err != nil {
- return
- }
- defer conn.CloseLasting()
- conn.FlushTable(&nftables.Table{
- Name: nftablesTableName,
- Family: nftablesFamily(family),
- })
- conn.DelTable(&nftables.Table{
- Name: nftablesTableName,
- Family: nftablesFamily(family),
- })
- _ = conn.Flush()
-}
diff --git a/sing-box/inbound/tun_auto_redirect_nftables_expr.go b/sing-box/inbound/tun_auto_redirect_nftables_expr.go
deleted file mode 100644
index 27c0309f38..0000000000
--- a/sing-box/inbound/tun_auto_redirect_nftables_expr.go
+++ /dev/null
@@ -1,153 +0,0 @@
-//go:build linux
-
-package inbound
-
-import (
- "net"
- "net/netip"
-
- "github.com/sagernet/nftables"
- "github.com/sagernet/nftables/binaryutil"
- "github.com/sagernet/nftables/expr"
- "github.com/sagernet/sing/common/ranges"
-
- "golang.org/x/sys/unix"
-)
-
-func nftablesIfname(n string) []byte {
- b := make([]byte, 16)
- copy(b, n+"\x00")
- return b
-}
-
-func nftablesRuleIfName(key expr.MetaKey, value string, exprs ...expr.Any) []expr.Any {
- newExprs := []expr.Any{
- &expr.Meta{Key: key, Register: 1},
- &expr.Cmp{
- Op: expr.CmpOpEq,
- Register: 1,
- Data: nftablesIfname(value),
- },
- }
- newExprs = append(newExprs, exprs...)
- return newExprs
-}
-
-func nftablesRuleMetaUInt32Range(key expr.MetaKey, uidRange ranges.Range[uint32], exprs ...expr.Any) []expr.Any {
- newExprs := []expr.Any{
- &expr.Meta{Key: key, Register: 1},
- &expr.Range{
- Op: expr.CmpOpEq,
- Register: 1,
- FromData: binaryutil.BigEndian.PutUint32(uidRange.Start),
- ToData: binaryutil.BigEndian.PutUint32(uidRange.End),
- },
- }
- newExprs = append(newExprs, exprs...)
- return newExprs
-}
-
-func nftablesRuleDestinationAddress(address netip.Prefix, exprs ...expr.Any) []expr.Any {
- var newExprs []expr.Any
- if address.Addr().Is4() {
- newExprs = append(newExprs, &expr.Payload{
- OperationType: expr.PayloadLoad,
- DestRegister: 1,
- SourceRegister: 0,
- Base: expr.PayloadBaseNetworkHeader,
- Offset: 16,
- Len: 4,
- }, &expr.Bitwise{
- SourceRegister: 1,
- DestRegister: 1,
- Len: 4,
- Xor: make([]byte, 4),
- Mask: net.CIDRMask(address.Bits(), 32),
- })
- } else {
- newExprs = append(newExprs, &expr.Payload{
- OperationType: expr.PayloadLoad,
- DestRegister: 1,
- SourceRegister: 0,
- Base: expr.PayloadBaseNetworkHeader,
- Offset: 24,
- Len: 16,
- }, &expr.Bitwise{
- SourceRegister: 1,
- DestRegister: 1,
- Len: 16,
- Xor: make([]byte, 16),
- Mask: net.CIDRMask(address.Bits(), 128),
- })
- }
- newExprs = append(newExprs, &expr.Cmp{
- Op: expr.CmpOpEq,
- Register: 1,
- Data: address.Masked().Addr().AsSlice(),
- })
- newExprs = append(newExprs, exprs...)
- return newExprs
-}
-
-func nftablesRuleHijackDNS(family nftables.TableFamily, dnsServerAddress netip.Addr) []expr.Any {
- return []expr.Any{
- &expr.Meta{
- Key: expr.MetaKeyL4PROTO,
- Register: 1,
- },
- &expr.Cmp{
- Op: expr.CmpOpEq,
- Register: 1,
- Data: []byte{unix.IPPROTO_UDP},
- },
- &expr.Payload{
- OperationType: expr.PayloadLoad,
- DestRegister: 1,
- SourceRegister: 0,
- Base: expr.PayloadBaseTransportHeader,
- Offset: 2,
- Len: 2,
- }, &expr.Cmp{
- Op: expr.CmpOpEq,
- Register: 1,
- Data: binaryutil.BigEndian.PutUint16(53),
- }, &expr.Immediate{
- Register: 1,
- Data: dnsServerAddress.AsSlice(),
- }, &expr.NAT{
- Type: expr.NATTypeDestNAT,
- Family: uint32(family),
- RegAddrMin: 1,
- },
- }
-}
-
-const (
- NF_NAT_RANGE_MAP_IPS = 1 << iota
- NF_NAT_RANGE_PROTO_SPECIFIED
- NF_NAT_RANGE_PROTO_RANDOM
- NF_NAT_RANGE_PERSISTENT
- NF_NAT_RANGE_PROTO_RANDOM_FULLY
- NF_NAT_RANGE_PROTO_OFFSET
-)
-
-func nftablesRuleRedirectToPorts(redirectPort uint16) []expr.Any {
- return []expr.Any{
- &expr.Meta{
- Key: expr.MetaKeyL4PROTO,
- Register: 1,
- },
- &expr.Cmp{
- Op: expr.CmpOpEq,
- Register: 1,
- Data: []byte{unix.IPPROTO_TCP},
- },
- &expr.Immediate{
- Register: 1,
- Data: binaryutil.BigEndian.PutUint16(redirectPort),
- }, &expr.Redir{
- RegisterProtoMin: 1,
- Flags: NF_NAT_RANGE_PROTO_SPECIFIED,
- },
- }
-}
diff --git a/sing-box/inbound/tun_auto_redirect_stub.go b/sing-box/inbound/tun_auto_redirect_stub.go
deleted file mode 100644
index 4bfdafa3b2..0000000000
--- a/sing-box/inbound/tun_auto_redirect_stub.go
+++ /dev/null
@@ -1,23 +0,0 @@
-//go:build !linux
-
-package inbound
-
-import (
- "os"
-
- E "github.com/sagernet/sing/common/exceptions"
-)
-
-type tunAutoRedirect struct{}
-
-func newAutoRedirect(t *Tun) (*tunAutoRedirect, error) {
- return nil, E.New("only supported on linux")
-}
-
-func (t *tunAutoRedirect) Start() error {
- return os.ErrInvalid
-}
-
-func (t *tunAutoRedirect) Close() error {
- return os.ErrInvalid
-}
diff --git a/sing-box/route/router.go b/sing-box/route/router.go
index e8950f1871..adabd5906a 100644
--- a/sing-box/route/router.go
+++ b/sing-box/route/router.go
@@ -402,20 +402,17 @@ func (r *Router) Initialize(inbounds []adapter.Inbound, outbounds []adapter.Outb
defaultOutboundForPacketConnection = detour
}
}
- var index, packetIndex int
if defaultOutboundForConnection == nil {
- for i, detour := range outbounds {
+ for _, detour := range outbounds {
if common.Contains(detour.Network(), N.NetworkTCP) {
- index = i
defaultOutboundForConnection = detour
break
}
}
}
if defaultOutboundForPacketConnection == nil {
- for i, detour := range outbounds {
+ for _, detour := range outbounds {
if common.Contains(detour.Network(), N.NetworkUDP) {
- packetIndex = i
defaultOutboundForPacketConnection = detour
break
}
@@ -432,22 +429,6 @@ func (r *Router) Initialize(inbounds []adapter.Inbound, outbounds []adapter.Outb
outbounds = append(outbounds, detour)
outboundByTag[detour.Tag()] = detour
}
- if defaultOutboundForConnection != defaultOutboundForPacketConnection {
- var description string
- if defaultOutboundForConnection.Tag() != "" {
- description = defaultOutboundForConnection.Tag()
- } else {
- description = F.ToString(index)
- }
- var packetDescription string
- if defaultOutboundForPacketConnection.Tag() != "" {
- packetDescription = defaultOutboundForPacketConnection.Tag()
- } else {
- packetDescription = F.ToString(packetIndex)
- }
- r.logger.Info("using ", defaultOutboundForConnection.Type(), "[", description, "] as default outbound for connection")
- r.logger.Info("using ", defaultOutboundForPacketConnection.Type(), "[", packetDescription, "] as default outbound for packet connection")
- }
r.inboundByTag = inboundByTag
r.outbounds = outbounds
r.defaultOutboundForConnection = defaultOutboundForConnection
@@ -1138,6 +1119,9 @@ func (r *Router) AutoDetectInterfaceFunc() control.Func {
if r.platformInterface != nil && r.platformInterface.UsePlatformAutoDetectInterfaceControl() {
return r.platformInterface.AutoDetectInterfaceControl()
} else {
+ if r.interfaceMonitor == nil {
+ return nil
+ }
return control.BindToInterfaceFunc(r.InterfaceFinder(), func(network string, address string) (interfaceName string, interfaceIndex int, err error) {
remoteAddr := M.ParseSocksaddr(address).Addr
if C.IsLinux {
diff --git a/sing-box/route/router_dns.go b/sing-box/route/router_dns.go
index c3383e8b46..b0d278cdc9 100644
--- a/sing-box/route/router_dns.go
+++ b/sing-box/route/router_dns.go
@@ -8,7 +8,6 @@ import (
"time"
"github.com/sagernet/sing-box/adapter"
- C "github.com/sagernet/sing-box/constant"
"github.com/sagernet/sing-dns"
"github.com/sagernet/sing/common/cache"
E "github.com/sagernet/sing/common/exceptions"
@@ -122,12 +121,10 @@ func (r *Router) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, er
for {
var (
dnsCtx context.Context
- cancel context.CancelFunc
addressLimit bool
)
dnsCtx, transport, strategy, rule, ruleIndex = r.matchDNS(ctx, true, ruleIndex)
- dnsCtx, cancel = context.WithTimeout(dnsCtx, C.DNSTimeout)
if rule != nil && rule.WithAddressLimit() && isAddressQuery(message) {
addressLimit = true
response, err = r.dnsClient.ExchangeWithResponseCheck(dnsCtx, transport, message, strategy, func(response *mDNS.Msg) bool {
@@ -138,7 +135,6 @@ func (r *Router) Exchange(ctx context.Context, message *mDNS.Msg) (*mDNS.Msg, er
addressLimit = false
response, err = r.dnsClient.Exchange(dnsCtx, transport, message, strategy)
}
- cancel()
var rejected bool
if err != nil {
if errors.Is(err, dns.ErrResponseRejectedCached) {
@@ -200,7 +196,6 @@ func (r *Router) Lookup(ctx context.Context, domain string, strategy dns.DomainS
for {
var (
dnsCtx context.Context
- cancel context.CancelFunc
addressLimit bool
)
metadata.ResetRuleCache()
@@ -209,7 +204,6 @@ func (r *Router) Lookup(ctx context.Context, domain string, strategy dns.DomainS
if strategy == dns.DomainStrategyAsIS {
strategy = transportStrategy
}
- dnsCtx, cancel = context.WithTimeout(dnsCtx, C.DNSTimeout)
if rule != nil && rule.WithAddressLimit() {
addressLimit = true
responseAddrs, err = r.dnsClient.LookupWithResponseCheck(dnsCtx, transport, domain, strategy, func(responseAddrs []netip.Addr) bool {
@@ -220,7 +214,6 @@ func (r *Router) Lookup(ctx context.Context, domain string, strategy dns.DomainS
addressLimit = false
responseAddrs, err = r.dnsClient.Lookup(dnsCtx, transport, domain, strategy)
}
- cancel()
if err != nil {
if errors.Is(err, dns.ErrResponseRejectedCached) {
r.dnsLogger.DebugContext(ctx, "response rejected for ", domain, " (cached)")
diff --git a/sing-box/transport/wireguard/client_bind.go b/sing-box/transport/wireguard/client_bind.go
index 39adce251e..6c534532a1 100644
--- a/sing-box/transport/wireguard/client_bind.go
+++ b/sing-box/transport/wireguard/client_bind.go
@@ -12,6 +12,8 @@ import (
E "github.com/sagernet/sing/common/exceptions"
M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network"
+ "github.com/sagernet/sing/service"
+ "github.com/sagernet/sing/service/pause"
"github.com/sagernet/wireguard-go/conn"
)
@@ -19,6 +21,9 @@ var _ conn.Bind = (*ClientBind)(nil)
type ClientBind struct {
ctx context.Context
+ pauseManager pause.Manager
+ bindCtx context.Context
+ bindDone context.CancelFunc
errorHandler E.Handler
dialer N.Dialer
reservedForEndpoint map[netip.AddrPort][3]uint8
@@ -33,6 +38,7 @@ type ClientBind struct {
func NewClientBind(ctx context.Context, errorHandler E.Handler, dialer N.Dialer, isConnect bool, connectAddr netip.AddrPort, reserved [3]uint8) *ClientBind {
return &ClientBind{
ctx: ctx,
+ pauseManager: service.FromContext[pause.Manager](ctx),
errorHandler: errorHandler,
dialer: dialer,
reservedForEndpoint: make(map[netip.AddrPort][3]uint8),
@@ -55,6 +61,11 @@ func (c *ClientBind) connect() (*wireConn, error) {
}
c.connAccess.Lock()
defer c.connAccess.Unlock()
+ select {
+ case <-c.done:
+ return nil, net.ErrClosed
+ default:
+ }
serverConn = c.conn
if serverConn != nil {
select {
@@ -65,7 +76,7 @@ func (c *ClientBind) connect() (*wireConn, error) {
}
}
if c.isConnect {
- udpConn, err := c.dialer.DialContext(c.ctx, N.NetworkUDP, M.SocksaddrFromNetIP(c.connectAddr))
+ udpConn, err := c.dialer.DialContext(c.bindCtx, N.NetworkUDP, M.SocksaddrFromNetIP(c.connectAddr))
if err != nil {
return nil, err
}
@@ -74,7 +85,7 @@ func (c *ClientBind) connect() (*wireConn, error) {
done: make(chan struct{}),
}
} else {
- udpConn, err := c.dialer.ListenPacket(c.ctx, M.Socksaddr{Addr: netip.IPv4Unspecified()})
+ udpConn, err := c.dialer.ListenPacket(c.bindCtx, M.Socksaddr{Addr: netip.IPv4Unspecified()})
if err != nil {
return nil, err
}
@@ -92,6 +103,7 @@ func (c *ClientBind) Open(port uint16) (fns []conn.ReceiveFunc, actualPort uint1
c.done = make(chan struct{})
default:
}
+ c.bindCtx, c.bindDone = context.WithCancel(c.ctx)
return []conn.ReceiveFunc{c.receive}, 0, nil
}
@@ -105,6 +117,7 @@ func (c *ClientBind) receive(packets [][]byte, sizes []int, eps []conn.Endpoint)
}
c.errorHandler.NewError(context.Background(), E.Cause(err, "connect to server"))
err = nil
+ c.pauseManager.WaitActive()
time.Sleep(time.Second)
return
}
@@ -130,12 +143,17 @@ func (c *ClientBind) receive(packets [][]byte, sizes []int, eps []conn.Endpoint)
}
func (c *ClientBind) Close() error {
- common.Close(common.PtrOrNil(c.conn))
select {
case <-c.done:
default:
close(c.done)
}
+ if c.bindDone != nil {
+ c.bindDone()
+ }
+ c.connAccess.Lock()
+ defer c.connAccess.Unlock()
+ common.Close(common.PtrOrNil(c.conn))
return nil
}
@@ -146,6 +164,8 @@ func (c *ClientBind) SetMark(mark uint32) error {
func (c *ClientBind) Send(bufs [][]byte, ep conn.Endpoint) error {
udpConn, err := c.connect()
if err != nil {
+ c.pauseManager.WaitActive()
+ time.Sleep(time.Second)
return err
}
destination := netip.AddrPort(ep.(Endpoint))
diff --git a/small/hysteria/Makefile b/small/hysteria/Makefile
index fbfa404010..8c8d304038 100644
--- a/small/hysteria/Makefile
+++ b/small/hysteria/Makefile
@@ -5,16 +5,16 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=hysteria
-PKG_VERSION:=2.4.4
+PKG_VERSION:=2.4.5
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/app/v$(PKG_VERSION)?
-PKG_HASH:=bbfe5ae78a7c90ec3b5bff5af34accc73eb2daa7dd7cf5ac954768a2833f8d60
+PKG_HASH:=e0d5ffb3ddd5e98092f29e908edb64468b1d8b40af78281cc0054b26f542a48b
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-app-v$(PKG_VERSION)
PKG_LICENSE:=MIT
-PKG_LICENSE_FILE:=LICENSE
+PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Tianling Shen
PKG_BUILD_DEPENDS:=golang/host
@@ -23,12 +23,12 @@ PKG_USE_MIPS16:=0
PKG_BUILD_FLAGS:=no-mips16
GO_PKG:=github.com/apernet/hysteria
-GO_PKG_BUILD_PKG:=$(GO_PKG)/app
+GO_PKG_BUILD_PKG:=$(GO_PKG)/app/v2
GO_PKG_LDFLAGS_X = \
- $(GO_PKG)/app/cmd.appVersion=v$(PKG_VERSION) \
- $(GO_PKG)/app/cmd.appType=release \
- $(GO_PKG)/app/cmd.appPlatform=$(GO_OS) \
- $(GO_PKG)/app/cmd.appArch=$(GO_ARCH)
+ $(GO_PKG)/app/v2/cmd.appVersion=v$(PKG_VERSION) \
+ $(GO_PKG)/app/v2/cmd.appType=release \
+ $(GO_PKG)/app/v2/cmd.appPlatform=$(GO_OS) \
+ $(GO_PKG)/app/v2/cmd.appArch=$(GO_ARCH)
include $(INCLUDE_DIR)/package.mk
include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk
@@ -37,7 +37,7 @@ define Package/hysteria
SECTION:=net
CATEGORY:=Network
TITLE:=A feature-packed network utility optimized for networks of poor quality
- URL:=https://github.com/apernet/hysteria
+ URL:=https://github.com/tobyxdd/hysteria
DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle
endef
@@ -51,7 +51,7 @@ endef
define Package/hysteria/install
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
- $(INSTALL_DIR) $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/app $(1)/usr/bin/hysteria
endef
diff --git a/small/luci-app-mosdns/Makefile b/small/luci-app-mosdns/Makefile
index 13e9982f21..bb832df9e0 100644
--- a/small/luci-app-mosdns/Makefile
+++ b/small/luci-app-mosdns/Makefile
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-mosdns
-PKG_VERSION:=1.5.20
+PKG_VERSION:=1.5.22
PKG_RELEASE:=1
LUCI_TITLE:=LuCI Support for mosdns
diff --git a/small/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua b/small/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua
index cff0c60a59..5d6d76d7d8 100644
--- a/small/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua
+++ b/small/luci-app-mosdns/luasrc/model/cbi/mosdns/basic.lua
@@ -47,7 +47,7 @@ o:depends("configfile", "/var/etc/mosdns.json")
o = s:taboption("basic", Flag, "redirect", translate("DNS Forward"), translate("Forward Dnsmasq Domain Name resolution requests to MosDNS"))
o.default = true
-o = s:taboption("basic", Flag, "prefer_ipv4", translate("Remote DNS prefer IPv4"), translate("IPv4 is preferred for remote DNS resolution of dual-stack addresses, and is not affected when the destination is IPv6 only"))
+o = s:taboption("basic", Flag, "prefer_ipv4", translate("Remote DNS prefer IPv4"), translate("IPv4 is preferred for Remote / Streaming Media DNS resolution of dual-stack addresses, and is not affected when the destination is IPv6 only"))
o:depends( "configfile", "/var/etc/mosdns.json")
o.default = true
@@ -85,6 +85,22 @@ o:value("tls://208.67.222.222", translate("Cisco Public DNS (208.67.222.222)"))
o:value("tls://208.67.220.220", translate("Cisco Public DNS (208.67.220.220)"))
o:depends("configfile", "/var/etc/mosdns.json")
+o = s:taboption("basic", Flag, "custom_stream_media_dns", translate("Custom Stream Media DNS"), translate("Netflix, Disney+, Hulu and streaming media rules list will use this DNS"))
+o:depends( "configfile", "/var/etc/mosdns.json")
+o.default = false
+
+o = s:taboption("basic", DynamicList, "stream_media_dns", translate("Streaming Media DNS server"))
+o:value("tls://1.1.1.1", translate("CloudFlare Public DNS (1.1.1.1)"))
+o:value("tls://1.0.0.1", translate("CloudFlare Public DNS (1.0.0.1)"))
+o:value("tls://8.8.8.8", translate("Google Public DNS (8.8.8.8)"))
+o:value("tls://8.8.4.4", translate("Google Public DNS (8.8.4.4)"))
+o:value("tls://9.9.9.9", translate("Quad9 Public DNS (9.9.9.9)"))
+o:value("tls://149.112.112.112", translate("Quad9 Public DNS (149.112.112.112)"))
+o:value("tls://208.67.222.222", translate("Cisco Public DNS (208.67.222.222)"))
+o:value("tls://208.67.220.220", translate("Cisco Public DNS (208.67.220.220)"))
+o.default = "tls://8.8.8.8"
+o:depends("custom_stream_media_dns", "1")
+
o = s:taboption("basic", ListValue, "bootstrap_dns", translate("Bootstrap DNS servers"), translate("Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams"))
o:value("119.29.29.29", translate("Tencent Public DNS (119.29.29.29)"))
o:value("119.28.28.28", translate("Tencent Public DNS (119.28.28.28)"))
@@ -125,7 +141,7 @@ o.rmempty = false
o.default = false
o:depends("configfile", "/var/etc/mosdns.json")
-o = s:taboption("advanced", Value, "remote_ecs_ip", translate("IP Address"), translate("Please provide the IP address you use when accessing foreign websites. This IP subnet (0/24) will be used as the ECS address for Remote DNS requests") .. '
' .. translate("This feature is typically used when using a self-built DNS server as an Remote DNS upstream (requires support from the upstream server)"))
+o = s:taboption("advanced", Value, "remote_ecs_ip", translate("IP Address"), translate("Please provide the IP address you use when accessing foreign websites. This IP subnet (0/24) will be used as the ECS address for Remote / Streaming Media DNS requests") .. '
' .. translate("This feature is typically used when using a self-built DNS server as an Remote / Streaming Media DNS upstream (requires support from the upstream server)"))
o.datatype = "ipaddr"
o:depends("enable_ecs_remote", "1")
diff --git a/small/luci-app-mosdns/luasrc/model/cbi/mosdns/rule_list.lua b/small/luci-app-mosdns/luasrc/model/cbi/mosdns/rule_list.lua
index 1d6554e23c..d41957beb3 100644
--- a/small/luci-app-mosdns/luasrc/model/cbi/mosdns/rule_list.lua
+++ b/small/luci-app-mosdns/luasrc/model/cbi/mosdns/rule_list.lua
@@ -7,6 +7,7 @@ local hosts_list_file = "/etc/mosdns/rule/hosts.txt"
local redirect_list_file = "/etc/mosdns/rule/redirect.txt"
local local_ptr_file = "/etc/mosdns/rule/local-ptr.txt"
local ddns_list_file = "/etc/mosdns/rule/ddnslist.txt"
+local streaming_media_list_file = "/etc/mosdns/rule/streaming.txt"
m = Map("mosdns")
@@ -20,6 +21,7 @@ s:tab("ddns_list", translate("DDNS Lists"))
s:tab("hosts_list", translate("Hosts"))
s:tab("redirect_list", translate("Redirect"))
s:tab("local_ptr_list", translate("Block PTR"))
+s:tab("streaming_media_list", translate("Streaming Media"))
o = s:taboption("white_list", TextValue, "whitelist", "", "" .. translate("These domain names allow DNS resolution with the highest priority. Please input the domain names of websites, every line can input only one website domain. For example: hm.baidu.com.") .. "" .. "" .. translate("
The list of rules only apply to 'Default Config' profiles.") .. "")
o.rows = 15
@@ -91,6 +93,16 @@ o.validate = function(self, value)
return value
end
+o = s:taboption("streaming_media_list", TextValue, "streaming_media", "", "" .. translate("These domains are always resolved using Streaming Media DNS. Please input the domain names of websites, every line can input only one website domain. For example: netflix.com.") .. "" .. "" .. translate("
The list of rules only apply to 'Default Config' profiles.") .. "")
+o.rows = 15
+o.wrap = "off"
+o.cfgvalue = function(self, section) return nixio.fs.readfile(streaming_media_list_file) or "" end
+o.write = function(self, section, value) nixio.fs.writefile(streaming_media_list_file, value:gsub("\r\n", "\n")) end
+o.remove = function(self, section, value) nixio.fs.writefile(streaming_media_list_file, "") end
+o.validate = function(self, value)
+ return value
+end
+
local apply = luci.http.formvalue("cbi.apply")
if apply then
luci.sys.exec("/etc/init.d/mosdns reload")
diff --git a/small/luci-app-mosdns/po/zh-cn/mosdns.po b/small/luci-app-mosdns/po/zh-cn/mosdns.po
index 07859801ed..15989d5bab 100644
--- a/small/luci-app-mosdns/po/zh-cn/mosdns.po
+++ b/small/luci-app-mosdns/po/zh-cn/mosdns.po
@@ -163,8 +163,8 @@ msgstr "日志文件"
msgid "Remote DNS prefer IPv4"
msgstr "远程 DNS 首选 IPv4"
-msgid "IPv4 is preferred for remote DNS resolution of dual-stack addresses, and is not affected when the destination is IPv6 only"
-msgstr "远程 DNS 解析双栈地址时首选 IPv4，目标仅 IPv6 时不受影响"
+msgid "IPv4 is preferred for Remote / Streaming Media DNS resolution of dual-stack addresses, and is not affected when the destination is IPv6 only"
+msgstr "远程 / 流媒体 DNS 解析双栈地址时首选 IPv4，目标仅 IPv6 时不受影响"
msgid "Custom China DNS"
msgstr "自定义国内 DNS"
@@ -280,11 +280,11 @@ msgstr "启用 EDNS 客户端子网"
msgid "IP Address"
msgstr "IP 地址"
-msgid "Please provide the IP address you use when accessing foreign websites. This IP subnet (0/24) will be used as the ECS address for Remote DNS requests"
-msgstr "请提供您在访问国外网站时使用的 IP 地址，这个 IP 子网（0/24）将用作远程 DNS 请求的 ECS 地址"
+msgid "Please provide the IP address you use when accessing foreign websites. This IP subnet (0/24) will be used as the ECS address for Remote / Streaming Media DNS requests"
+msgstr "请提供您在访问国外网站时使用的 IP 地址，这个 IP 子网（0/24）将用作 远程 / 流媒体 DNS 请求的 ECS 地址"
-msgid "This feature is typically used when using a self-built DNS server as an Remote DNS upstream (requires support from the upstream server)"
-msgstr "此功能通常在使用自建 DNS 服务器作为 远程 DNS 上游时使用（需要上游服务器的支持）"
+msgid "This feature is typically used when using a self-built DNS server as an Remote / Streaming Media DNS upstream (requires support from the upstream server)"
+msgstr "此功能通常在使用自建 DNS 服务器作为 远程 / 流媒体 DNS 上游时使用（需要上游服务器的支持）"
msgid "Prevent DNS Leaks"
msgstr "防止 DNS 泄漏"
@@ -396,3 +396,18 @@ msgstr "输入需要导出的 GeoIP.dat 类别条目，允许添加多个标签"
msgid "Export directory: /var/mosdns"
msgstr "导出目录：/var/mosdns"
+
+msgid "Custom Stream Media DNS"
+msgstr "自定义流媒体 DNS"
+
+msgid "Streaming Media DNS server"
+msgstr "流媒体 DNS 服务器"
+
+msgid "Netflix, Disney+, Hulu and streaming media rules list will use this DNS"
+msgstr "自定义 Netflix、Disney+、Hulu 以及 “流媒体” 规则列表的 DNS 服务器"
+
+msgid "Streaming Media"
+msgstr "流媒体"
+
+msgid "These domains are always resolved using Streaming Media DNS. Please input the domain names of websites, every line can input only one website domain. For example: netflix.com."
+msgstr "启用 “自定义流媒体 DNS” 时，加入的域名始终使用 “流媒体 DNS 服务器” 进行解析（每个域名一行，支持域名匹配规则）"
diff --git a/small/luci-app-mosdns/root/etc/config/mosdns b/small/luci-app-mosdns/root/etc/config/mosdns
index 603ab7637e..a15981f5a1 100644
--- a/small/luci-app-mosdns/root/etc/config/mosdns
+++ b/small/luci-app-mosdns/root/etc/config/mosdns
@@ -24,6 +24,7 @@ config mosdns 'config'
option dns_leak '0'
option cloudflare '0'
option listen_port_api '9091'
+ option custom_stream_media_dns '0'
option bootstrap_dns '119.29.29.29'
list remote_dns 'tls://8.8.8.8'
list remote_dns 'tls://1.1.1.1'
diff --git a/small/luci-app-mosdns/root/etc/init.d/mosdns b/small/luci-app-mosdns/root/etc/init.d/mosdns
index 8670fb14d6..aa16291f48 100755
--- a/small/luci-app-mosdns/root/etc/init.d/mosdns
+++ b/small/luci-app-mosdns/root/etc/init.d/mosdns
@@ -51,6 +51,8 @@ get_config() {
config_get remote_dns $1 remote_dns "tls://8.8.8.8 tls://1.1.1.1"
config_get custom_local_dns $1 custom_local_dns 0
config_get apple_optimization $1 apple_optimization 0
+ config_get custom_stream_media_dns $1 custom_stream_media_dns 0
+ config_get stream_media_dns $1 stream_media_dns "tls://8.8.8.8"
config_get bootstrap_dns $1 bootstrap_dns "119.29.29.29"
config_get listen_port_api $1 listen_port_api 9091
config_get concurrent $1 concurrent 1
@@ -205,6 +207,19 @@ generate_config() {
json_close_array
json_close_object
json_close_object
+ # plugin: stream_media
+ json_add_object
+ json_add_string "tag" "stream_media"
+ json_add_string "type" "domain_set"
+ json_add_object "args"
+ json_add_array "files"
+ json_add_string "" "/var/mosdns/geosite_disney.txt"
+ json_add_string "" "/var/mosdns/geosite_netflix.txt"
+ json_add_string "" "/var/mosdns/geosite_hulu.txt"
+ json_add_string "" "/etc/mosdns/rule/streaming.txt"
+ json_close_array
+ json_close_object
+ json_close_object
# plugin: cloudflare_cidr
json_add_object
json_add_string "tag" "cloudflare_cidr"
@@ -315,6 +330,51 @@ generate_config() {
json_close_object
json_close_array
json_close_object
+ # plugin: forward_stream_media
+ json_add_object
+ json_add_string "tag" "forward_stream_media"
+ json_add_string "type" "forward"
+ json_add_object "args"
+ json_add_int "concurrent" "$concurrent"
+ json_add_array "upstreams"
+ for addr in $stream_media_dns; do
+ enable_http3=0
+ if echo "$addr" | grep -q "^h3://"; then
+ enable_http3=1
+ addr=$(echo $addr | sed 's/h3:\/\//https:\/\//g')
+ fi
+ json_add_object
+ json_add_string "addr" "$addr"
+ json_add_string "bootstrap" "$bootstrap_dns"
+ json_add_boolean "enable_pipeline" "$enable_pipeline"
+ json_add_boolean "insecure_skip_verify" "$insecure_skip_verify"
+ json_add_int "idle_timeout" "$idle_timeout"
+ [ "$enable_http3" -eq 1 ] && json_add_boolean "enable_http3" "1"
+ json_close_object
+ done
+ json_close_array
+ json_close_object
+ json_close_object
+ # plugin: forward_stream_media_upstream
+ json_add_object
+ json_add_string "tag" "forward_stream_media_upstream"
+ json_add_string "type" "sequence"
+ json_add_array "args"
+ [ "$prefer_ipv4" -eq 1 ] && {
+ json_add_object
+ json_add_string "exec" "prefer_ipv4"
+ json_close_object
+ }
+ [ "$enable_ecs_remote" -eq 1 ] && {
+ json_add_object
+ json_add_string "exec" "ecs $remote_ecs_ip"
+ json_close_object
+ }
+ json_add_object
+ json_add_string "exec" "\$forward_stream_media"
+ json_close_object
+ json_close_array
+ json_close_object
# plugin: modify_ttl
json_add_object
json_add_string "tag" "modify_ttl"
@@ -491,6 +551,17 @@ generate_config() {
json_close_object
json_close_array
json_close_object
+ # plugin: query_is_stream_media_domain
+ json_add_object
+ json_add_string "tag" "query_is_stream_media_domain"
+ json_add_string "type" "sequence"
+ json_add_array "args"
+ json_add_object
+ json_add_string "matches" "qname \$stream_media"
+ json_add_string "exec" "\$forward_stream_media_upstream"
+ json_close_object
+ json_close_array
+ json_close_object
# plugin: main_sequence
json_add_object
json_add_string "tag" "main_sequence"
@@ -549,6 +620,14 @@ generate_config() {
json_add_object
json_add_string "exec" "jump has_resp_sequence"
json_close_object
+ [ "$custom_stream_media_dns" -eq 1 ] && {
+ json_add_object
+ json_add_string "exec" "\$query_is_stream_media_domain"
+ json_close_object
+ json_add_object
+ json_add_string "exec" "jump has_resp_sequence"
+ json_close_object
+ }
json_add_object
json_add_string "exec" "\$query_is_local_domain"
json_close_object
diff --git a/small/luci-app-mosdns/root/etc/mosdns/rule/streaming.txt b/small/luci-app-mosdns/root/etc/mosdns/rule/streaming.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/small/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh b/small/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
index a8fb606457..32eaf55c1e 100755
--- a/small/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
+++ b/small/luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
@@ -143,6 +143,7 @@ v2dat_dump() {
adblock=$(uci -q get mosdns.config.adblock)
ad_source=$(uci -q get mosdns.config.ad_source)
configfile=$(uci -q get mosdns.config.configfile)
+ streaming_media=$(uci -q get mosdns.config.custom_stream_media_dns)
mkdir -p /var/mosdns
rm -f /var/mosdns/geo*.txt
if [ "$configfile" = "/var/etc/mosdns.json" ]; then
@@ -150,6 +151,8 @@ v2dat_dump() {
v2dat unpack geoip -o /var/mosdns -f cn $v2dat_dir/geoip.dat
v2dat unpack geosite -o /var/mosdns -f cn -f apple -f 'geolocation-!cn' $v2dat_dir/geosite.dat
[ "$adblock" -eq 1 ] && [ $(echo $ad_source | grep -c geosite.dat) -ge '1' ] && v2dat unpack geosite -o /var/mosdns -f category-ads-all $v2dat_dir/geosite.dat
+ [ "$streaming_media" -eq 1 ] && v2dat unpack geosite -o /var/mosdns -f netflix -f disney -f hulu $v2dat_dir/geosite.dat || \
+ touch /var/mosdns/geosite_disney.txt ; touch /var/mosdns/geosite_netflix.txt ; touch /var/mosdns/geosite_hulu.txt
else
# custom config
v2dat unpack geoip -o /var/mosdns -f cn $v2dat_dir/geoip.dat
diff --git a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
index 89378eec45..ef406ad3ff 100644
--- a/small/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/small/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
@@ -73,7 +73,7 @@ local doh_validate = function(self, value, t)
for i = 1, #val do
local v = val[i]
if v then
- if not datatypes.ipmask4(v) then
+ if not datatypes.ipmask4(v) and not datatypes.ipmask6(v) then
flag = 1
end
end
diff --git a/small/shadowsocks-rust/Makefile b/small/shadowsocks-rust/Makefile
index b0ebc98dda..084b5854f9 100644
--- a/small/shadowsocks-rust/Makefile
+++ b/small/shadowsocks-rust/Makefile
@@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shadowsocks-rust
-PKG_VERSION:=1.19.0
+PKG_VERSION:=1.19.2
PKG_RELEASE:=1
PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION)
@@ -21,29 +21,29 @@ endif
ifeq ($(ARCH),aarch64)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).aarch64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
- PKG_HASH:=c0ac84f0efdae92b19e72f5477438da5d2c835d3e0bf14a2b8dea0e0b6bcc064
+ PKG_HASH:=cf462a5f0d2c8d09babcf709978172a62d08758f67390fe09f5509dce454f511
else ifeq ($(ARCH),arm)
# Referred to golang/golang-values.mk
ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
ifeq ($(ARM_CPU_FEATURES),)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabi.$(PKG_SOURCE_FOOTER)
- PKG_HASH:=2d350f6d990cfd0f0af70ec889e77bf121f7a711129bb2ff7def926676cb90ee
+ PKG_HASH:=f71fa138fda5cd5b22e35bf4991cd18db8dac1dea75b43ce835151f9d80a78c0
else
PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER)
- PKG_HASH:=da2ace727b75039aabc4ebff74bc1ade07ffd21e46d4239aa7537b8665f71d33
+ PKG_HASH:=5ac5267b25ed65d9943b5112a5bfd038f040b1458f200f14730be02a64fddbc0
endif
else ifeq ($(ARCH),i386)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).i686-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
- PKG_HASH:=074ac1591be87ba846df962f895b0dd7b07120ef900a1fbfee86b40f8f13d93d
+ PKG_HASH:=4d08ec5232b8848902949c39f03a5f066d6d1acd8506306ea5de0f1c8734d90a
else ifeq ($(ARCH),x86_64)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).x86_64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
- PKG_HASH:=b2321bd795db6fb71b3bc70da03e1dd6aa64d194ce3183ffda789e08329edfd1
+ PKG_HASH:=19ecd3c86dbb05012b34c4d8c38eec2c24ca5d10ad52e2b7e7554f8176bf4fa8
else ifeq ($(ARCH),mips)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).mips-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
- PKG_HASH:=e5ba11eb81c94d5376586df8ad05793cf87038c83c2b02a6a1fbd3aebd6aecf8
+ PKG_HASH:=2e3ec0d4b32c58b074290bd6764c17f1ba5972c28a39ef90463bfdea37830599
else ifeq ($(ARCH),mipsel)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).mipsel-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
- PKG_HASH:=e735d637f3c2e57b1d102f1a0c64bc3688f59632b7aa946310d5338117e308fd
+ PKG_HASH:=3f8920df884f115d838e070f6b67ea98d3fb97ad1ccb93b802615869c447230c
# Set the default value to make OpenWrt Package Checker happy
else
PKG_SOURCE:=dummy
diff --git a/small/v2ray-geodata/Makefile b/small/v2ray-geodata/Makefile
index 715e21f107..c5ac9c10a0 100644
--- a/small/v2ray-geodata/Makefile
+++ b/small/v2ray-geodata/Makefile
@@ -12,31 +12,31 @@ PKG_MAINTAINER:=Tianling Shen
include $(INCLUDE_DIR)/package.mk
-GEOIP_VER:=202405300042
+GEOIP_VER:=202406060042
GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
define Download/geoip
URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
URL_FILE:=geoip.dat
FILE:=$(GEOIP_FILE)
- HASH:=ee22e254e7cb9a2e45d8851a70022662c15c739604c379029ae8f6a19a3ccc4f
+ HASH:=19d53a38cfaaac6e5a2be6d0b2710ebf094979d33380cdcb5fd5d073f07a2248
endef
-GEOSITE_VER:=20240508170917
+GEOSITE_VER:=20240604215500
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE)
- HASH:=25d6120b009498ac83ae723e9751a19ff545fac4800dad53ab6e2592c3407533
+ HASH:=146800cbe3ec546a8ca3ed75524ad34bb3bf9d77d6f707b361eef67e4cf45d07
endef
-GEOSITE_IRAN_VER:=202405270027
+GEOSITE_IRAN_VER:=202406030028
GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER)
define Download/geosite-ir
URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/
URL_FILE:=iran.dat
FILE:=$(GEOSITE_IRAN_FILE)
- HASH:=8c37d450d8b756fcc58e71eeef67d4db419c05216259c177bd2cf01c55851d67
+ HASH:=5dc876f4ba837ae095f889a81a5529ee8fc07a6290e2f4ece3fcd6943c58996b
endef
define Package/v2ray-geodata/template
diff --git a/v2rayn/v2rayN/ProtosLib/ProtosLib.csproj b/v2rayn/v2rayN/ProtosLib/ProtosLib.csproj
index a9dab02aed..2c84666b65 100644
--- a/v2rayn/v2rayN/ProtosLib/ProtosLib.csproj
+++ b/v2rayn/v2rayN/ProtosLib/ProtosLib.csproj
@@ -9,9 +9,9 @@
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/v2rayn/v2rayN/v2rayN/Common/JsonUtils.cs b/v2rayn/v2rayN/v2rayN/Common/JsonUtils.cs
index 2198ba3541..ab81d41efa 100644
--- a/v2rayn/v2rayN/v2rayN/Common/JsonUtils.cs
+++ b/v2rayn/v2rayN/v2rayN/Common/JsonUtils.cs
@@ -105,9 +105,12 @@ namespace v2rayN
///
///
///
- public static int ToFile(object? obj, string filePath, bool nullValue = true)
+ public static int ToFile(object? obj, string? filePath, bool nullValue = true)
{
- int result;
+ if (filePath is null)
+ {
+ return -1;
+ }
try
{
using FileStream file = File.Create(filePath);
@@ -119,14 +122,13 @@ namespace v2rayN
};
JsonSerializer.Serialize(file, obj, options);
- result = 0;
+ return 0;
}
catch (Exception ex)
{
Logging.SaveLog(ex.Message, ex);
- result = -1;
+ return -1;
}
- return result;
}
}
}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Common/QRCodeHelper.cs b/v2rayn/v2rayN/v2rayN/Common/QRCodeHelper.cs
index 9b02a48b83..255ab475d5 100644
--- a/v2rayn/v2rayN/v2rayN/Common/QRCodeHelper.cs
+++ b/v2rayn/v2rayN/v2rayN/Common/QRCodeHelper.cs
@@ -1,13 +1,13 @@
using QRCoder;
using QRCoder.Xaml;
using System.Drawing;
-using System.Windows.Interop;
using System.Windows;
+using System.Windows.Interop;
using System.Windows.Media;
+using ZXing;
using ZXing.Common;
using ZXing.QrCode;
using ZXing.Windows.Compatibility;
-using ZXing;
namespace v2rayN
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/EConfigType.cs b/v2rayn/v2rayN/v2rayN/Enums/EConfigType.cs
similarity index 90%
rename from v2rayn/v2rayN/v2rayN/Models/EConfigType.cs
rename to v2rayn/v2rayN/v2rayN/Enums/EConfigType.cs
index 81880eb43d..60ef796a43 100644
--- a/v2rayn/v2rayN/v2rayN/Models/EConfigType.cs
+++ b/v2rayn/v2rayN/v2rayN/Enums/EConfigType.cs
@@ -1,4 +1,4 @@
-namespace v2rayN.Models
+namespace v2rayN.Enums
{
public enum EConfigType
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/ECoreType.cs b/v2rayn/v2rayN/v2rayN/Enums/ECoreType.cs
similarity index 92%
rename from v2rayn/v2rayN/v2rayN/Models/ECoreType.cs
rename to v2rayn/v2rayN/v2rayN/Enums/ECoreType.cs
index f1556b32b2..54c078870f 100644
--- a/v2rayn/v2rayN/v2rayN/Models/ECoreType.cs
+++ b/v2rayn/v2rayN/v2rayN/Enums/ECoreType.cs
@@ -1,4 +1,4 @@
-namespace v2rayN.Models
+namespace v2rayN.Enums
{
public enum ECoreType
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/EGlobalHotkey.cs b/v2rayn/v2rayN/v2rayN/Enums/EGlobalHotkey.cs
similarity index 87%
rename from v2rayn/v2rayN/v2rayN/Models/EGlobalHotkey.cs
rename to v2rayn/v2rayN/v2rayN/Enums/EGlobalHotkey.cs
index 46183028bd..f4a92bdba8 100644
--- a/v2rayn/v2rayN/v2rayN/Models/EGlobalHotkey.cs
+++ b/v2rayn/v2rayN/v2rayN/Enums/EGlobalHotkey.cs
@@ -1,4 +1,4 @@
-namespace v2rayN.Models
+namespace v2rayN.Enums
{
public enum EGlobalHotkey
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/EInboundProtocol.cs b/v2rayn/v2rayN/v2rayN/Enums/EInboundProtocol.cs
similarity index 85%
rename from v2rayn/v2rayN/v2rayN/Models/EInboundProtocol.cs
rename to v2rayn/v2rayN/v2rayN/Enums/EInboundProtocol.cs
index 79440fb96c..5bc955a889 100644
--- a/v2rayn/v2rayN/v2rayN/Models/EInboundProtocol.cs
+++ b/v2rayn/v2rayN/v2rayN/Enums/EInboundProtocol.cs
@@ -1,4 +1,4 @@
-namespace v2rayN.Models
+namespace v2rayN.Enums
{
public enum EInboundProtocol
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/EMove.cs b/v2rayn/v2rayN/v2rayN/Enums/EMove.cs
similarity index 82%
rename from v2rayn/v2rayN/v2rayN/Models/EMove.cs
rename to v2rayn/v2rayN/v2rayN/Enums/EMove.cs
index 0629e62db9..fcbc23dccd 100644
--- a/v2rayn/v2rayN/v2rayN/Models/EMove.cs
+++ b/v2rayn/v2rayN/v2rayN/Enums/EMove.cs
@@ -1,4 +1,4 @@
-namespace v2rayN.Models
+namespace v2rayN.Enums
{
public enum EMove
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/EServerColName.cs b/v2rayn/v2rayN/v2rayN/Enums/EServerColName.cs
similarity index 91%
rename from v2rayn/v2rayN/v2rayN/Models/EServerColName.cs
rename to v2rayn/v2rayN/v2rayN/Enums/EServerColName.cs
index 8bf9111bc4..453dbe881a 100644
--- a/v2rayn/v2rayN/v2rayN/Models/EServerColName.cs
+++ b/v2rayn/v2rayN/v2rayN/Enums/EServerColName.cs
@@ -1,4 +1,4 @@
-namespace v2rayN.Models
+namespace v2rayN.Enums
{
public enum EServerColName
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/ESpeedActionType.cs b/v2rayn/v2rayN/v2rayN/Enums/ESpeedActionType.cs
similarity index 81%
rename from v2rayn/v2rayN/v2rayN/Models/ESpeedActionType.cs
rename to v2rayn/v2rayN/v2rayN/Enums/ESpeedActionType.cs
index dee2970903..e0663d92d6 100644
--- a/v2rayn/v2rayN/v2rayN/Models/ESpeedActionType.cs
+++ b/v2rayn/v2rayN/v2rayN/Enums/ESpeedActionType.cs
@@ -1,4 +1,4 @@
-namespace v2rayN.Models
+namespace v2rayN.Enums
{
public enum ESpeedActionType
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/ESysProxyType.cs b/v2rayn/v2rayN/v2rayN/Enums/ESysProxyType.cs
similarity index 83%
rename from v2rayn/v2rayN/v2rayN/Models/ESysProxyType.cs
rename to v2rayn/v2rayN/v2rayN/Enums/ESysProxyType.cs
index 9c5bb423e1..b08576122c 100644
--- a/v2rayn/v2rayN/v2rayN/Models/ESysProxyType.cs
+++ b/v2rayn/v2rayN/v2rayN/Enums/ESysProxyType.cs
@@ -1,4 +1,4 @@
-namespace v2rayN.Models
+namespace v2rayN.Enums
{
public enum ESysProxyType
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/ETransport.cs b/v2rayn/v2rayN/v2rayN/Enums/ETransport.cs
similarity index 85%
rename from v2rayn/v2rayN/v2rayN/Models/ETransport.cs
rename to v2rayn/v2rayN/v2rayN/Enums/ETransport.cs
index 15eac5da10..7ad8a66e4b 100644
--- a/v2rayn/v2rayN/v2rayN/Models/ETransport.cs
+++ b/v2rayn/v2rayN/v2rayN/Enums/ETransport.cs
@@ -1,4 +1,4 @@
-namespace v2rayN.Models
+namespace v2rayN.Enums
{
public enum ETransport
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/EViewAction.cs b/v2rayn/v2rayN/v2rayN/Enums/EViewAction.cs
similarity index 77%
rename from v2rayn/v2rayN/v2rayN/Models/EViewAction.cs
rename to v2rayn/v2rayN/v2rayN/Enums/EViewAction.cs
index 1abdbde858..8a5a4641e3 100644
--- a/v2rayn/v2rayN/v2rayN/Models/EViewAction.cs
+++ b/v2rayn/v2rayN/v2rayN/Enums/EViewAction.cs
@@ -1,4 +1,4 @@
-namespace v2rayN.Models
+namespace v2rayN.Enums
{
public enum EViewAction
{
diff --git a/v2rayn/v2rayN/v2rayN/Global.cs b/v2rayn/v2rayN/v2rayN/Global.cs
index ec89420453..28b9331f9a 100644
--- a/v2rayn/v2rayN/v2rayN/Global.cs
+++ b/v2rayn/v2rayN/v2rayN/Global.cs
@@ -1,4 +1,4 @@
-using v2rayN.Models;
+using v2rayN.Enums;
namespace v2rayN
{
@@ -106,7 +106,6 @@ namespace v2rayN
@"https://speed.cloudflare.com/__down?bytes=100000000",
@"https://speed.cloudflare.com/__down?bytes=10000000",
@"http://cachefly.cachefly.net/50mb.test",
- @"http://cachefly.cachefly.net/100mb.test",
@"http://cachefly.cachefly.net/10mb.test"
};
diff --git a/v2rayn/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayn/v2rayN/v2rayN/Handler/ConfigHandler.cs
index cd1819e055..a8a248bbe7 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -1,6 +1,8 @@
using System.Data;
using System.IO;
using System.Text.RegularExpressions;
+using v2rayN.Enums;
+using v2rayN.Handler.Fmt;
using v2rayN.Models;
namespace v2rayN.Handler
@@ -1069,12 +1071,12 @@ namespace v2rayN.Handler
/// 批量添加服务器
///
///
- ///
+ ///
///
/// 成功导入的数量
- private static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub, List lstOriSub)
+ private static int AddBatchServers(Config config, string strData, string subid, bool isSub, List lstOriSub)
{
- if (Utils.IsNullOrEmpty(clipboardData))
+ if (Utils.IsNullOrEmpty(strData))
{
return -1;
}
@@ -1091,7 +1093,7 @@ namespace v2rayN.Handler
//Check for duplicate indexId
List? lstDbIndexId = null;
List lstAdd = new();
- var arrData = clipboardData.Split(Environment.NewLine.ToCharArray()).Where(t => !t.IsNullOrEmpty());
+ var arrData = strData.Split(Environment.NewLine.ToCharArray()).Where(t => !t.IsNullOrEmpty());
if (isSub)
{
arrData = arrData.Distinct();
@@ -1107,7 +1109,7 @@ namespace v2rayN.Handler
}
continue;
}
- var profileItem = ShareHandler.ImportFromClipboardConfig(str, out string msg);
+ var profileItem = FmtHandler.ResolveConfig(str, out string msg);
if (profileItem is null)
{
continue;
@@ -1176,9 +1178,9 @@ namespace v2rayN.Handler
return countServers;
}
- private static int AddBatchServers4Custom(Config config, string clipboardData, string subid, bool isSub, List lstOriSub)
+ private static int AddBatchServers4Custom(Config config, string strData, string subid, bool isSub, List lstOriSub)
{
- if (Utils.IsNullOrEmpty(clipboardData))
+ if (Utils.IsNullOrEmpty(strData))
{
return -1;
}
@@ -1194,7 +1196,7 @@ namespace v2rayN.Handler
}
//Is v2ray array configuration
- var configObjects = JsonUtils.Deserialize(clipboardData);
+ var configObjects = JsonUtils.Deserialize(strData);
if (configObjects != null && configObjects.Length > 0)
{
if (isSub && !Utils.IsNullOrEmpty(subid))
@@ -1235,42 +1237,42 @@ namespace v2rayN.Handler
ProfileItem profileItem = new();
//Is v2ray configuration
- var v2rayConfig = JsonUtils.Deserialize(clipboardData);
+ var v2rayConfig = JsonUtils.Deserialize(strData);
if (v2rayConfig?.inbounds?.Count > 0
&& v2rayConfig.outbounds?.Count > 0)
{
var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
- File.WriteAllText(fileName, clipboardData);
+ File.WriteAllText(fileName, strData);
profileItem.coreType = ECoreType.Xray;
profileItem.address = fileName;
profileItem.remarks = v2rayConfig.remarks ?? "v2ray_custom";
}
//Is Clash configuration
- else if (Contains(clipboardData, "port", "socks-port", "proxies"))
+ else if (Contains(strData, "port", "socks-port", "proxies"))
{
var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.yaml");
- File.WriteAllText(fileName, clipboardData);
+ File.WriteAllText(fileName, strData);
profileItem.coreType = ECoreType.mihomo;
profileItem.address = fileName;
profileItem.remarks = "clash_custom";
}
//Is hysteria configuration
- else if (Contains(clipboardData, "server", "up", "down", "listen", "", ""))
+ else if (Contains(strData, "server", "up", "down", "listen", "", ""))
{
var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
- File.WriteAllText(fileName, clipboardData);
+ File.WriteAllText(fileName, strData);
profileItem.coreType = ECoreType.hysteria;
profileItem.address = fileName;
profileItem.remarks = "hysteria_custom";
}
//Is naiveproxy configuration
- else if (Contains(clipboardData, "listen", "proxy", "", ""))
+ else if (Contains(strData, "listen", "proxy", "", ""))
{
var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
- File.WriteAllText(fileName, clipboardData);
+ File.WriteAllText(fileName, strData);
profileItem.coreType = ECoreType.naiveproxy;
profileItem.address = fileName;
@@ -1281,7 +1283,7 @@ namespace v2rayN.Handler
{
return -1;
//var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.txt");
- //File.WriteAllText(fileName, clipboardData);
+ //File.WriteAllText(fileName, strData);
//profileItem.address = fileName;
//profileItem.remarks = "other_custom";
@@ -1313,9 +1315,9 @@ namespace v2rayN.Handler
}
}
- private static int AddBatchServers4SsSIP008(Config config, string clipboardData, string subid, bool isSub, List lstOriSub)
+ private static int AddBatchServers4SsSIP008(Config config, string strData, string subid, bool isSub, List lstOriSub)
{
- if (Utils.IsNullOrEmpty(clipboardData))
+ if (Utils.IsNullOrEmpty(strData))
{
return -1;
}
@@ -1326,10 +1328,10 @@ namespace v2rayN.Handler
}
//SsSIP008
- var lstSsServer = JsonUtils.Deserialize>(clipboardData);
+ var lstSsServer = JsonUtils.Deserialize>(strData);
if (lstSsServer?.Count <= 0)
{
- var ssSIP008 = JsonUtils.Deserialize(clipboardData);
+ var ssSIP008 = JsonUtils.Deserialize(strData);
if (ssSIP008?.servers?.Count > 0)
{
lstSsServer = ssSIP008.servers;
@@ -1364,7 +1366,7 @@ namespace v2rayN.Handler
return -1;
}
- public static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub)
+ public static int AddBatchServers(Config config, string strData, string subid, bool isSub)
{
List? lstOriSub = null;
if (isSub && !Utils.IsNullOrEmpty(subid))
@@ -1373,28 +1375,28 @@ namespace v2rayN.Handler
}
var counter = 0;
- if (Utils.IsBase64String(clipboardData))
+ if (Utils.IsBase64String(strData))
{
- counter = AddBatchServers(config, Utils.Base64Decode(clipboardData), subid, isSub, lstOriSub);
+ counter = AddBatchServers(config, Utils.Base64Decode(strData), subid, isSub, lstOriSub);
}
if (counter < 1)
{
- counter = AddBatchServers(config, clipboardData, subid, isSub, lstOriSub);
+ counter = AddBatchServers(config, strData, subid, isSub, lstOriSub);
}
if (counter < 1)
{
- counter = AddBatchServers(config, Utils.Base64Decode(clipboardData), subid, isSub, lstOriSub);
+ counter = AddBatchServers(config, Utils.Base64Decode(strData), subid, isSub, lstOriSub);
}
if (counter < 1)
{
- counter = AddBatchServers4SsSIP008(config, clipboardData, subid, isSub, lstOriSub);
+ counter = AddBatchServers4SsSIP008(config, strData, subid, isSub, lstOriSub);
}
//maybe other sub
if (counter < 1)
{
- counter = AddBatchServers4Custom(config, clipboardData, subid, isSub, lstOriSub);
+ counter = AddBatchServers4Custom(config, strData, subid, isSub, lstOriSub);
}
return counter;
@@ -1532,16 +1534,16 @@ namespace v2rayN.Handler
/// AddBatchRoutingRules
///
///
- ///
+ ///
///
- public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
+ public static int AddBatchRoutingRules(ref RoutingItem routingItem, string strData)
{
- if (Utils.IsNullOrEmpty(clipboardData))
+ if (Utils.IsNullOrEmpty(strData))
{
return -1;
}
- var lstRules = JsonUtils.Deserialize>(clipboardData);
+ var lstRules = JsonUtils.Deserialize>(strData);
if (lstRules == null)
{
return -1;
diff --git a/v2rayn/v2rayN/v2rayN/Handler/CoreConfigHandler.cs b/v2rayn/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigHandler.cs
similarity index 95%
rename from v2rayn/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
rename to v2rayn/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigHandler.cs
index bc7c92985c..3f73f5423d 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigHandler.cs
@@ -1,8 +1,9 @@
using System.IO;
+using v2rayN.Enums;
using v2rayN.Models;
using v2rayN.Resx;
-namespace v2rayN.Handler
+namespace v2rayN.Handler.CoreConfig
{
///
/// Core configuration file processing class
@@ -154,7 +155,7 @@ namespace v2rayN.Handler
{
if (coreType == ECoreType.sing_box)
{
- if ((new CoreConfigSingbox(config)).GenerateClientSpeedtestConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
+ if (new CoreConfigSingbox(config).GenerateClientSpeedtestConfig(selecteds, out SingboxConfig? singboxConfig, out msg) != 0)
{
return -1;
}
@@ -162,7 +163,7 @@ namespace v2rayN.Handler
}
else
{
- if ((new CoreConfigV2ray(config)).GenerateClientSpeedtestConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
+ if (new CoreConfigV2ray(config).GenerateClientSpeedtestConfig(selecteds, out V2rayConfig? v2rayConfig, out msg) != 0)
{
return -1;
}
diff --git a/v2rayn/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayn/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigSingbox.cs
similarity index 99%
rename from v2rayn/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
rename to v2rayn/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigSingbox.cs
index c2cd926c8f..887bfd2215 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigSingbox.cs
@@ -1,9 +1,10 @@
using System.Net;
using System.Net.NetworkInformation;
+using v2rayN.Enums;
using v2rayN.Models;
using v2rayN.Resx;
-namespace v2rayN.Handler
+namespace v2rayN.Handler.CoreConfig
{
internal class CoreConfigSingbox
{
@@ -25,6 +26,11 @@ namespace v2rayN.Handler
msg = ResUI.CheckServerSettings;
return -1;
}
+ if (node.GetNetwork() == nameof(ETransport.kcp))
+ {
+ msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
+ return -1;
+ }
msg = ResUI.InitialConfiguration;
@@ -114,7 +120,7 @@ namespace v2rayN.Handler
var listen = "::";
singboxConfig.inbounds = [];
- if (!_config.tunModeItem.enableTun || (_config.tunModeItem.enableTun && _config.tunModeItem.enableExInbound))
+ if (!_config.tunModeItem.enableTun || _config.tunModeItem.enableTun && _config.tunModeItem.enableExInbound)
{
var inbound = new Inbound4Sbox()
{
diff --git a/v2rayn/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayn/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigV2ray.cs
similarity index 99%
rename from v2rayn/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
rename to v2rayn/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigV2ray.cs
index 8ca96e9513..e182008032 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigV2ray.cs
@@ -1,9 +1,10 @@
using System.Net;
using System.Net.NetworkInformation;
+using v2rayN.Enums;
using v2rayN.Models;
using v2rayN.Resx;
-namespace v2rayN.Handler
+namespace v2rayN.Handler.CoreConfig
{
internal class CoreConfigV2ray
{
@@ -276,8 +277,8 @@ namespace v2rayN.Handler
if (!hasDomainIp)
{
if (!Utils.IsNullOrEmpty(rules.port)
- || (rules.protocol?.Count > 0)
- || (rules.inboundTag?.Count > 0)
+ || rules.protocol?.Count > 0
+ || rules.inboundTag?.Count > 0
)
{
var it = JsonUtils.DeepCopy(rules);
@@ -673,7 +674,7 @@ namespace v2rayN.Handler
{
authority = Utils.IsNullOrEmpty(host) ? null : host,
serviceName = node.path,
- multiMode = (node.headerType == Global.GrpcMultiMode),
+ multiMode = node.headerType == Global.GrpcMultiMode,
idle_timeout = _config.grpcItem.idle_timeout,
health_check_timeout = _config.grpcItem.health_check_timeout,
permit_without_stream = _config.grpcItem.permit_without_stream,
diff --git a/v2rayn/v2rayN/v2rayN/Handler/CoreHandler.cs b/v2rayn/v2rayN/v2rayN/Handler/CoreHandler.cs
index b6b37c2f4e..dbe70658eb 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/CoreHandler.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/CoreHandler.cs
@@ -2,6 +2,8 @@
using System.IO;
using System.Reactive.Linq;
using System.Text;
+using v2rayN.Enums;
+using v2rayN.Handler.CoreConfig;
using v2rayN.Models;
using v2rayN.Resx;
@@ -39,6 +41,7 @@ namespace v2rayN.Handler
if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
{
ShowMsg(false, msg);
+ return;
}
else
{
diff --git a/v2rayn/v2rayN/v2rayN/Handler/DownloadHandle.cs b/v2rayn/v2rayN/v2rayN/Handler/DownloadHandle.cs
index d29106e645..8500e9f7b7 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -4,7 +4,7 @@ using System.Net;
using System.Net.Http;
using System.Net.Http.Headers;
using System.Net.Sockets;
-using v2rayN.Models;
+using v2rayN.Enums;
using v2rayN.Resx;
namespace v2rayN.Handler
diff --git a/v2rayn/v2rayN/v2rayN/Handler/Fmt/BaseFmt.cs b/v2rayn/v2rayN/v2rayN/Handler/Fmt/BaseFmt.cs
new file mode 100644
index 0000000000..8bc9bb4843
--- /dev/null
+++ b/v2rayn/v2rayN/v2rayN/Handler/Fmt/BaseFmt.cs
@@ -0,0 +1,184 @@
+using System.Collections.Specialized;
+using v2rayN.Enums;
+using v2rayN.Models;
+
+namespace v2rayN.Handler.Fmt
+{
+ internal class BaseFmt
+ {
+ protected static string GetIpv6(string address)
+ {
+ if (Utils.IsIpv6(address))
+ {
+ // 检查地址是否已经被方括号包围，如果没有，则添加方括号
+ return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
+ }
+ return address; // 如果不是IPv6地址，直接返回原地址
+ }
+
+ protected static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary dicQuery)
+ {
+ if (!Utils.IsNullOrEmpty(item.flow))
+ {
+ dicQuery.Add("flow", item.flow);
+ }
+
+ if (!Utils.IsNullOrEmpty(item.streamSecurity))
+ {
+ dicQuery.Add("security", item.streamSecurity);
+ }
+ else
+ {
+ if (securityDef != null)
+ {
+ dicQuery.Add("security", securityDef);
+ }
+ }
+ if (!Utils.IsNullOrEmpty(item.sni))
+ {
+ dicQuery.Add("sni", item.sni);
+ }
+ if (!Utils.IsNullOrEmpty(item.alpn))
+ {
+ dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+ }
+ if (!Utils.IsNullOrEmpty(item.fingerprint))
+ {
+ dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
+ }
+ if (!Utils.IsNullOrEmpty(item.publicKey))
+ {
+ dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
+ }
+ if (!Utils.IsNullOrEmpty(item.shortId))
+ {
+ dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
+ }
+ if (!Utils.IsNullOrEmpty(item.spiderX))
+ {
+ dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
+ }
+
+ dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
+
+ switch (item.network)
+ {
+ case nameof(ETransport.tcp):
+ dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
+ if (!Utils.IsNullOrEmpty(item.requestHost))
+ {
+ dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+ }
+ break;
+
+ case nameof(ETransport.kcp):
+ dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
+ if (!Utils.IsNullOrEmpty(item.path))
+ {
+ dicQuery.Add("seed", Utils.UrlEncode(item.path));
+ }
+ break;
+
+ case nameof(ETransport.ws):
+ case nameof(ETransport.httpupgrade):
+ if (!Utils.IsNullOrEmpty(item.requestHost))
+ {
+ dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+ }
+ if (!Utils.IsNullOrEmpty(item.path))
+ {
+ dicQuery.Add("path", Utils.UrlEncode(item.path));
+ }
+ break;
+
+ case nameof(ETransport.http):
+ case nameof(ETransport.h2):
+ dicQuery["type"] = nameof(ETransport.http);
+ if (!Utils.IsNullOrEmpty(item.requestHost))
+ {
+ dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+ }
+ if (!Utils.IsNullOrEmpty(item.path))
+ {
+ dicQuery.Add("path", Utils.UrlEncode(item.path));
+ }
+ break;
+
+ case nameof(ETransport.quic):
+ dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
+ dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
+ dicQuery.Add("key", Utils.UrlEncode(item.path));
+ break;
+
+ case nameof(ETransport.grpc):
+ if (!Utils.IsNullOrEmpty(item.path))
+ {
+ dicQuery.Add("authority", Utils.UrlEncode(item.requestHost));
+ dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
+ if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
+ {
+ dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
+ }
+ }
+ break;
+ }
+ return 0;
+ }
+
+ protected static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
+ {
+ item.flow = query["flow"] ?? "";
+ item.streamSecurity = query["security"] ?? "";
+ item.sni = query["sni"] ?? "";
+ item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
+ item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
+ item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
+ item.shortId = Utils.UrlDecode(query["sid"] ?? "");
+ item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
+
+ item.network = query["type"] ?? nameof(ETransport.tcp);
+ switch (item.network)
+ {
+ case nameof(ETransport.tcp):
+ item.headerType = query["headerType"] ?? Global.None;
+ item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+
+ break;
+
+ case nameof(ETransport.kcp):
+ item.headerType = query["headerType"] ?? Global.None;
+ item.path = Utils.UrlDecode(query["seed"] ?? "");
+ break;
+
+ case nameof(ETransport.ws):
+ case nameof(ETransport.httpupgrade):
+ item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+ item.path = Utils.UrlDecode(query["path"] ?? "/");
+ break;
+
+ case nameof(ETransport.http):
+ case nameof(ETransport.h2):
+ item.network = nameof(ETransport.h2);
+ item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+ item.path = Utils.UrlDecode(query["path"] ?? "/");
+ break;
+
+ case nameof(ETransport.quic):
+ item.headerType = query["headerType"] ?? Global.None;
+ item.requestHost = query["quicSecurity"] ?? Global.None;
+ item.path = Utils.UrlDecode(query["key"] ?? "");
+ break;
+
+ case nameof(ETransport.grpc):
+ item.requestHost = Utils.UrlDecode(query["authority"] ?? "");
+ item.path = Utils.UrlDecode(query["serviceName"] ?? "");
+ item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
+ break;
+
+ default:
+ break;
+ }
+ return 0;
+ }
+ }
+}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/Fmt/FmtHandler.cs b/v2rayn/v2rayN/v2rayN/Handler/Fmt/FmtHandler.cs
new file mode 100644
index 0000000000..34ec25a337
--- /dev/null
+++ b/v2rayn/v2rayN/v2rayN/Handler/Fmt/FmtHandler.cs
@@ -0,0 +1,95 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+ internal class FmtHandler
+ {
+ public static string? GetShareUri(ProfileItem item)
+ {
+ try
+ {
+ var url = item.configType switch
+ {
+ EConfigType.VMess => VmessFmt.ToUri(item),
+ EConfigType.Shadowsocks => ShadowsocksFmt.ToUri(item),
+ EConfigType.Socks => SocksFmt.ToUri(item),
+ EConfigType.Trojan => TrojanFmt.ToUri(item),
+ EConfigType.VLESS => VLESSFmt.ToUri(item),
+ EConfigType.Hysteria2 => Hysteria2Fmt.ToUri(item),
+ EConfigType.Tuic => TuicFmt.ToUri(item),
+ EConfigType.Wireguard => WireguardFmt.ToUri(item),
+ _ => null,
+ };
+
+ return url;
+ }
+ catch (Exception ex)
+ {
+ Logging.SaveLog(ex.Message, ex);
+ return "";
+ }
+ }
+
+
+ public static ProfileItem? ResolveConfig(string config, out string msg)
+ {
+ msg = ResUI.ConfigurationFormatIncorrect;
+
+ try
+ {
+ string str = config.TrimEx();
+ if (Utils.IsNullOrEmpty(str))
+ {
+ msg = ResUI.FailedReadConfiguration;
+ return null;
+ }
+
+ if (str.StartsWith(Global.ProtocolShares[EConfigType.VMess]))
+ {
+ return VmessFmt.Resolve(str, out msg);
+ }
+ else if (str.StartsWith(Global.ProtocolShares[EConfigType.Shadowsocks]))
+ {
+ return ShadowsocksFmt.Resolve(str, out msg);
+ }
+ else if (str.StartsWith(Global.ProtocolShares[EConfigType.Socks]))
+ {
+ return SocksFmt.Resolve(str, out msg);
+ }
+ else if (str.StartsWith(Global.ProtocolShares[EConfigType.Trojan]))
+ {
+ return TrojanFmt.Resolve(str, out msg);
+ }
+ else if (str.StartsWith(Global.ProtocolShares[EConfigType.VLESS]))
+ {
+ return VLESSFmt.Resolve(str, out msg);
+ }
+ else if (str.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || str.StartsWith(Global.Hysteria2ProtocolShare))
+ {
+ return Hysteria2Fmt.Resolve(str, out msg);
+ }
+ else if (str.StartsWith(Global.ProtocolShares[EConfigType.Tuic]))
+ {
+ return TuicFmt.Resolve(str, out msg);
+ }
+ else if (str.StartsWith(Global.ProtocolShares[EConfigType.Wireguard]))
+ {
+ return WireguardFmt.Resolve(str, out msg);
+ }
+ else
+ {
+ msg = ResUI.NonvmessOrssProtocol;
+ return null;
+ }
+ }
+ catch (Exception ex)
+ {
+ Logging.SaveLog(ex.Message, ex);
+ msg = ResUI.Incorrectconfiguration;
+ return null;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/Fmt/Hysteria2Fmt.cs b/v2rayn/v2rayN/v2rayN/Handler/Fmt/Hysteria2Fmt.cs
new file mode 100644
index 0000000000..6565e935c7
--- /dev/null
+++ b/v2rayn/v2rayN/v2rayN/Handler/Fmt/Hysteria2Fmt.cs
@@ -0,0 +1,68 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+ internal class Hysteria2Fmt : BaseFmt
+ {
+ public static ProfileItem? Resolve(string str, out string msg)
+ {
+ msg = ResUI.ConfigurationFormatIncorrect;
+ ProfileItem item = new()
+ {
+ configType = EConfigType.Hysteria2
+ };
+
+ Uri url = new(str);
+
+ item.address = url.IdnHost;
+ item.port = url.Port;
+ item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+ item.id = Utils.UrlDecode(url.UserInfo);
+
+ var query = Utils.ParseQueryString(url.Query);
+ ResolveStdTransport(query, ref item);
+ item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
+ item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
+
+ return item;
+ }
+
+ public static string? ToUri(ProfileItem? item)
+ {
+ if (item == null) return null;
+ string url = string.Empty;
+
+ string remark = string.Empty;
+ if (!Utils.IsNullOrEmpty(item.remarks))
+ {
+ remark = "#" + Utils.UrlEncode(item.remarks);
+ }
+ var dicQuery = new Dictionary();
+ if (!Utils.IsNullOrEmpty(item.sni))
+ {
+ dicQuery.Add("sni", item.sni);
+ }
+ if (!Utils.IsNullOrEmpty(item.alpn))
+ {
+ dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+ }
+ if (!Utils.IsNullOrEmpty(item.path))
+ {
+ dicQuery.Add("obfs", "salamander");
+ dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
+ }
+ dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
+
+ string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+ url = string.Format("{0}@{1}:{2}",
+ item.id,
+ GetIpv6(item.address),
+ item.port);
+ url = $"{Global.ProtocolShares[EConfigType.Hysteria2]}{url}/{query}{remark}";
+ return url;
+ }
+ }
+}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/Fmt/ShadowsocksFmt.cs b/v2rayn/v2rayN/v2rayN/Handler/Fmt/ShadowsocksFmt.cs
new file mode 100644
index 0000000000..92f51400b3
--- /dev/null
+++ b/v2rayn/v2rayN/v2rayN/Handler/Fmt/ShadowsocksFmt.cs
@@ -0,0 +1,150 @@
+using System.Text.RegularExpressions;
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+ internal class ShadowsocksFmt : BaseFmt
+ {
+ public static ProfileItem? Resolve(string str, out string msg)
+ {
+ msg = ResUI.ConfigurationFormatIncorrect;
+ ProfileItem? item;
+
+ item = ResolveSSLegacy(str) ?? ResolveSip002(str);
+ if (item == null)
+ {
+ return null;
+ }
+ if (item.address.Length == 0 || item.port == 0 || item.security.Length == 0 || item.id.Length == 0)
+ {
+ return null;
+ }
+
+ item.configType = EConfigType.Shadowsocks;
+
+ return item;
+ }
+
+ public static string? ToUri(ProfileItem? item)
+ {
+ if (item == null) return null;
+ string url = string.Empty;
+
+ string remark = string.Empty;
+ if (!Utils.IsNullOrEmpty(item.remarks))
+ {
+ remark = "#" + Utils.UrlEncode(item.remarks);
+ }
+ //url = string.Format("{0}:{1}@{2}:{3}",
+ // item.security,
+ // item.id,
+ // item.address,
+ // item.port);
+ //url = Utile.Base64Encode(url);
+ //new Sip002
+ var pw = Utils.Base64Encode($"{item.security}:{item.id}");
+ url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
+ url = $"{Global.ProtocolShares[EConfigType.Shadowsocks]}{url}{remark}";
+ return url;
+ }
+
+ private static readonly Regex UrlFinder = new(@"ss://(?[A-Za-z0-9+-/=_]+)(?:#(?\S+))?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+ private static readonly Regex DetailsParser = new(@"^((?.+?):(?.*)@(?.+?):(?\d+?))$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+ private static ProfileItem? ResolveSSLegacy(string result)
+ {
+ var match = UrlFinder.Match(result);
+ if (!match.Success)
+ return null;
+
+ ProfileItem item = new();
+ var base64 = match.Groups["base64"].Value.TrimEnd('/');
+ var tag = match.Groups["tag"].Value;
+ if (!Utils.IsNullOrEmpty(tag))
+ {
+ item.remarks = Utils.UrlDecode(tag);
+ }
+ Match details;
+ try
+ {
+ details = DetailsParser.Match(Utils.Base64Decode(base64));
+ }
+ catch (FormatException)
+ {
+ return null;
+ }
+ if (!details.Success)
+ return null;
+ item.security = details.Groups["method"].Value;
+ item.id = details.Groups["password"].Value;
+ item.address = details.Groups["hostname"].Value;
+ item.port = Utils.ToInt(details.Groups["port"].Value);
+ return item;
+ }
+
+ private static ProfileItem? ResolveSip002(string result)
+ {
+ Uri parsedUrl;
+ try
+ {
+ parsedUrl = new Uri(result);
+ }
+ catch (UriFormatException)
+ {
+ return null;
+ }
+ ProfileItem item = new()
+ {
+ remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+ address = parsedUrl.IdnHost,
+ port = parsedUrl.Port,
+ };
+ string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.UriEscaped);
+ //2022-blake3
+ if (rawUserInfo.Contains(':'))
+ {
+ string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
+ if (userInfoParts.Length != 2)
+ {
+ return null;
+ }
+ item.security = userInfoParts[0];
+ item.id = Utils.UrlDecode(userInfoParts[1]);
+ }
+ else
+ {
+ // parse base64 UserInfo
+ string userInfo = Utils.Base64Decode(rawUserInfo);
+ string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
+ if (userInfoParts.Length != 2)
+ {
+ return null;
+ }
+ item.security = userInfoParts[0];
+ item.id = userInfoParts[1];
+ }
+
+ var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
+ if (queryParameters["plugin"] != null)
+ {
+ //obfs-host exists
+ var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
+ if (queryParameters["plugin"].Contains("obfs=http") && !Utils.IsNullOrEmpty(obfsHost))
+ {
+ obfsHost = obfsHost?.Replace("obfs-host=", "");
+ item.network = Global.DefaultNetwork;
+ item.headerType = Global.TcpHeaderHttp;
+ item.requestHost = obfsHost ?? "";
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ return item;
+ }
+ }
+}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/Fmt/SocksFmt.cs b/v2rayn/v2rayN/v2rayN/Handler/Fmt/SocksFmt.cs
new file mode 100644
index 0000000000..ae99f3f800
--- /dev/null
+++ b/v2rayn/v2rayN/v2rayN/Handler/Fmt/SocksFmt.cs
@@ -0,0 +1,131 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+ internal class SocksFmt : BaseFmt
+ {
+ public static ProfileItem? Resolve(string str, out string msg)
+ {
+ msg = ResUI.ConfigurationFormatIncorrect;
+ ProfileItem? item;
+
+ item = ResolveSocksNew(str) ?? ResolveSocks(str);
+ if (item == null)
+ {
+ return null;
+ }
+ if (item.address.Length == 0 || item.port == 0)
+ {
+ return null;
+ }
+
+ item.configType = EConfigType.Socks;
+
+ return item;
+ }
+
+ public static string? ToUri(ProfileItem? item)
+ {
+ if (item == null) return null;
+ string url = string.Empty;
+
+ string remark = string.Empty;
+ if (!Utils.IsNullOrEmpty(item.remarks))
+ {
+ remark = "#" + Utils.UrlEncode(item.remarks);
+ }
+ //url = string.Format("{0}:{1}@{2}:{3}",
+ // item.security,
+ // item.id,
+ // item.address,
+ // item.port);
+ //url = Utile.Base64Encode(url);
+ //new
+ var pw = Utils.Base64Encode($"{item.security}:{item.id}");
+ url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
+ url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
+ return url;
+ }
+
+ private static ProfileItem? ResolveSocks(string result)
+ {
+ ProfileItem item = new()
+ {
+ configType = EConfigType.Socks
+ };
+ result = result[Global.ProtocolShares[EConfigType.Socks].Length..];
+ //remark
+ int indexRemark = result.IndexOf("#");
+ if (indexRemark > 0)
+ {
+ try
+ {
+ item.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
+ }
+ catch { }
+ result = result[..indexRemark];
+ }
+ //part decode
+ int indexS = result.IndexOf("@");
+ if (indexS > 0)
+ {
+ }
+ else
+ {
+ result = Utils.Base64Decode(result);
+ }
+
+ string[] arr1 = result.Split('@');
+ if (arr1.Length != 2)
+ {
+ return null;
+ }
+ string[] arr21 = arr1[0].Split(':');
+ //string[] arr22 = arr1[1].Split(':');
+ int indexPort = arr1[1].LastIndexOf(":");
+ if (arr21.Length != 2 || indexPort < 0)
+ {
+ return null;
+ }
+ item.address = arr1[1][..indexPort];
+ item.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
+ item.security = arr21[0];
+ item.id = arr21[1];
+
+ return item;
+ }
+
+ private static ProfileItem? ResolveSocksNew(string result)
+ {
+ Uri parsedUrl;
+ try
+ {
+ parsedUrl = new Uri(result);
+ }
+ catch (UriFormatException)
+ {
+ return null;
+ }
+ ProfileItem item = new()
+ {
+ remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
+ address = parsedUrl.IdnHost,
+ port = parsedUrl.Port,
+ };
+
+ // parse base64 UserInfo
+ string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
+ string userInfo = Utils.Base64Decode(rawUserInfo);
+ string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
+ if (userInfoParts.Length == 2)
+ {
+ item.security = userInfoParts[0];
+ item.id = userInfoParts[1];
+ }
+
+ return item;
+ }
+ }
+}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/Fmt/TrojanFmt.cs b/v2rayn/v2rayN/v2rayN/Handler/Fmt/TrojanFmt.cs
new file mode 100644
index 0000000000..71f23805d8
--- /dev/null
+++ b/v2rayn/v2rayN/v2rayN/Handler/Fmt/TrojanFmt.cs
@@ -0,0 +1,53 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+ internal class TrojanFmt : BaseFmt
+ {
+ public static ProfileItem? Resolve(string str, out string msg)
+ {
+ msg = ResUI.ConfigurationFormatIncorrect;
+
+ ProfileItem item = new()
+ {
+ configType = EConfigType.Trojan
+ };
+
+ Uri url = new(str);
+
+ item.address = url.IdnHost;
+ item.port = url.Port;
+ item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+ item.id = Utils.UrlDecode(url.UserInfo);
+
+ var query = Utils.ParseQueryString(url.Query);
+ ResolveStdTransport(query, ref item);
+
+ return item;
+ }
+
+ public static string? ToUri(ProfileItem? item)
+ {
+ if (item == null) return null;
+ string url = string.Empty;
+
+ string remark = string.Empty;
+ if (!Utils.IsNullOrEmpty(item.remarks))
+ {
+ remark = "#" + Utils.UrlEncode(item.remarks);
+ }
+ var dicQuery = new Dictionary();
+ GetStdTransport(item, null, ref dicQuery);
+ string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+ url = string.Format("{0}@{1}:{2}",
+ item.id,
+ GetIpv6(item.address),
+ item.port);
+ url = $"{Global.ProtocolShares[EConfigType.Trojan]}{url}{query}{remark}";
+ return url;
+ }
+ }
+}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/Fmt/TuicFmt.cs b/v2rayn/v2rayN/v2rayN/Handler/Fmt/TuicFmt.cs
new file mode 100644
index 0000000000..f1c64cd9b2
--- /dev/null
+++ b/v2rayn/v2rayN/v2rayN/Handler/Fmt/TuicFmt.cs
@@ -0,0 +1,68 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+ internal class TuicFmt : BaseFmt
+ {
+ public static ProfileItem? Resolve(string str, out string msg)
+ {
+ msg = ResUI.ConfigurationFormatIncorrect;
+
+ ProfileItem item = new()
+ {
+ configType = EConfigType.Tuic
+ };
+
+ Uri url = new(str);
+
+ item.address = url.IdnHost;
+ item.port = url.Port;
+ item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+ var userInfoParts = url.UserInfo.Split(new[] { ':' }, 2);
+ if (userInfoParts.Length == 2)
+ {
+ item.id = userInfoParts[0];
+ item.security = userInfoParts[1];
+ }
+
+ var query = Utils.ParseQueryString(url.Query);
+ ResolveStdTransport(query, ref item);
+ item.headerType = query["congestion_control"] ?? "";
+
+ return item;
+ }
+
+ public static string? ToUri(ProfileItem? item)
+ {
+ if (item == null) return null;
+ string url = string.Empty;
+
+ string remark = string.Empty;
+ if (!Utils.IsNullOrEmpty(item.remarks))
+ {
+ remark = "#" + Utils.UrlEncode(item.remarks);
+ }
+ var dicQuery = new Dictionary();
+ if (!Utils.IsNullOrEmpty(item.sni))
+ {
+ dicQuery.Add("sni", item.sni);
+ }
+ if (!Utils.IsNullOrEmpty(item.alpn))
+ {
+ dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+ }
+ dicQuery.Add("congestion_control", item.headerType);
+
+ string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+ url = string.Format("{0}@{1}:{2}",
+ $"{item.id}:{item.security}",
+ GetIpv6(item.address),
+ item.port);
+ url = $"{Global.ProtocolShares[EConfigType.Tuic]}{url}{query}{remark}";
+ return url;
+ }
+ }
+}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/Fmt/VLESSFmt.cs b/v2rayn/v2rayN/v2rayN/Handler/Fmt/VLESSFmt.cs
new file mode 100644
index 0000000000..b7451ca2da
--- /dev/null
+++ b/v2rayn/v2rayN/v2rayN/Handler/Fmt/VLESSFmt.cs
@@ -0,0 +1,64 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+ internal class VLESSFmt : BaseFmt
+ {
+ public static ProfileItem? Resolve(string str, out string msg)
+ {
+ msg = ResUI.ConfigurationFormatIncorrect;
+
+ ProfileItem item = new()
+ {
+ configType = EConfigType.VLESS,
+ security = Global.None
+ };
+
+ Uri url = new(str);
+
+ item.address = url.IdnHost;
+ item.port = url.Port;
+ item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+ item.id = Utils.UrlDecode(url.UserInfo);
+
+ var query = Utils.ParseQueryString(url.Query);
+ item.security = query["encryption"] ?? Global.None;
+ item.streamSecurity = query["security"] ?? "";
+ ResolveStdTransport(query, ref item);
+
+ return item;
+ }
+
+ public static string? ToUri(ProfileItem? item)
+ {
+ if (item == null) return null;
+ string url = string.Empty;
+
+ string remark = string.Empty;
+ if (!Utils.IsNullOrEmpty(item.remarks))
+ {
+ remark = "#" + Utils.UrlEncode(item.remarks);
+ }
+ var dicQuery = new Dictionary();
+ if (!Utils.IsNullOrEmpty(item.security))
+ {
+ dicQuery.Add("encryption", item.security);
+ }
+ else
+ {
+ dicQuery.Add("encryption", Global.None);
+ }
+ GetStdTransport(item, Global.None, ref dicQuery);
+ string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+ url = string.Format("{0}@{1}:{2}",
+ item.id,
+ GetIpv6(item.address),
+ item.port);
+ url = $"{Global.ProtocolShares[EConfigType.VLESS]}{url}{query}{remark}";
+ return url;
+ }
+ }
+}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/Fmt/VmessFmt.cs b/v2rayn/v2rayN/v2rayN/Handler/Fmt/VmessFmt.cs
new file mode 100644
index 0000000000..5e0b230f07
--- /dev/null
+++ b/v2rayn/v2rayN/v2rayN/Handler/Fmt/VmessFmt.cs
@@ -0,0 +1,228 @@
+using System.Text.RegularExpressions;
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+ internal class VmessFmt : BaseFmt
+ {
+ private static readonly Regex StdVmessUserInfo = new(
+ @"^(?[a-z]+)(\+(?[a-z]+))?:(?[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$", RegexOptions.Compiled);
+
+ public static ProfileItem? Resolve(string str, out string msg)
+ {
+ msg = ResUI.ConfigurationFormatIncorrect;
+ ProfileItem? item;
+ int indexSplit = str.IndexOf("?");
+ if (indexSplit > 0)
+ {
+ item = ResolveStdVmess(str) ?? ResolveVmess4Kitsunebi(str);
+ }
+ else
+ {
+ item = ResolveVmess(str, out msg);
+ }
+ return item;
+ }
+
+ public static string? ToUri(ProfileItem? item)
+ {
+ if (item == null) return null;
+ string url = string.Empty;
+
+ VmessQRCode vmessQRCode = new()
+ {
+ v = item.configVersion,
+ ps = item.remarks.TrimEx(),
+ add = item.address,
+ port = item.port,
+ id = item.id,
+ aid = item.alterId,
+ scy = item.security,
+ net = item.network,
+ type = item.headerType,
+ host = item.requestHost,
+ path = item.path,
+ tls = item.streamSecurity,
+ sni = item.sni,
+ alpn = item.alpn,
+ fp = item.fingerprint
+ };
+
+ url = JsonUtils.Serialize(vmessQRCode);
+ url = Utils.Base64Encode(url);
+ url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
+
+ return url;
+ }
+
+ private static ProfileItem? ResolveVmess(string result, out string msg)
+ {
+ msg = string.Empty;
+ var item = new ProfileItem
+ {
+ configType = EConfigType.VMess
+ };
+
+ result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
+ result = Utils.Base64Decode(result);
+
+ //转成Json
+ VmessQRCode? vmessQRCode = JsonUtils.Deserialize(result);
+ if (vmessQRCode == null)
+ {
+ msg = ResUI.FailedConversionConfiguration;
+ return null;
+ }
+
+ item.network = Global.DefaultNetwork;
+ item.headerType = Global.None;
+
+ item.configVersion = Utils.ToInt(vmessQRCode.v);
+ item.remarks = Utils.ToString(vmessQRCode.ps);
+ item.address = Utils.ToString(vmessQRCode.add);
+ item.port = Utils.ToInt(vmessQRCode.port);
+ item.id = Utils.ToString(vmessQRCode.id);
+ item.alterId = Utils.ToInt(vmessQRCode.aid);
+ item.security = Utils.ToString(vmessQRCode.scy);
+
+ item.security = !Utils.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
+ if (!Utils.IsNullOrEmpty(vmessQRCode.net))
+ {
+ item.network = vmessQRCode.net;
+ }
+ if (!Utils.IsNullOrEmpty(vmessQRCode.type))
+ {
+ item.headerType = vmessQRCode.type;
+ }
+
+ item.requestHost = Utils.ToString(vmessQRCode.host);
+ item.path = Utils.ToString(vmessQRCode.path);
+ item.streamSecurity = Utils.ToString(vmessQRCode.tls);
+ item.sni = Utils.ToString(vmessQRCode.sni);
+ item.alpn = Utils.ToString(vmessQRCode.alpn);
+ item.fingerprint = Utils.ToString(vmessQRCode.fp);
+
+ return item;
+ }
+
+ private static ProfileItem? ResolveStdVmess(string result)
+ {
+ ProfileItem item = new()
+ {
+ configType = EConfigType.VMess,
+ security = "auto"
+ };
+
+ Uri u = new(result);
+
+ item.address = u.IdnHost;
+ item.port = u.Port;
+ item.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+ var query = Utils.ParseQueryString(u.Query);
+
+ var m = StdVmessUserInfo.Match(u.UserInfo);
+ if (!m.Success) return null;
+
+ item.id = m.Groups["id"].Value;
+
+ if (m.Groups["streamSecurity"].Success)
+ {
+ item.streamSecurity = m.Groups["streamSecurity"].Value;
+ }
+ switch (item.streamSecurity)
+ {
+ case Global.StreamSecurity:
+ break;
+
+ default:
+ if (!Utils.IsNullOrEmpty(item.streamSecurity))
+ return null;
+ break;
+ }
+
+ item.network = m.Groups["network"].Value;
+ switch (item.network)
+ {
+ case nameof(ETransport.tcp):
+ string t1 = query["type"] ?? Global.None;
+ item.headerType = t1;
+ break;
+
+ case nameof(ETransport.kcp):
+ item.headerType = query["type"] ?? Global.None;
+ break;
+
+ case nameof(ETransport.ws):
+ case nameof(ETransport.httpupgrade):
+ string p1 = query["path"] ?? "/";
+ string h1 = query["host"] ?? "";
+ item.requestHost = Utils.UrlDecode(h1);
+ item.path = p1;
+ break;
+
+ case nameof(ETransport.http):
+ case nameof(ETransport.h2):
+ item.network = nameof(ETransport.h2);
+ string p2 = query["path"] ?? "/";
+ string h2 = query["host"] ?? "";
+ item.requestHost = Utils.UrlDecode(h2);
+ item.path = p2;
+ break;
+
+ case nameof(ETransport.quic):
+ string s = query["security"] ?? Global.None;
+ string k = query["key"] ?? "";
+ string t3 = query["type"] ?? Global.None;
+ item.headerType = t3;
+ item.requestHost = Utils.UrlDecode(s);
+ item.path = k;
+ break;
+
+ default:
+ return null;
+ }
+
+ return item;
+ }
+
+ private static ProfileItem? ResolveVmess4Kitsunebi(string result)
+ {
+ ProfileItem item = new()
+ {
+ configType = EConfigType.VMess
+ };
+ result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
+ int indexSplit = result.IndexOf("?");
+ if (indexSplit > 0)
+ {
+ result = result[..indexSplit];
+ }
+ result = Utils.Base64Decode(result);
+
+ string[] arr1 = result.Split('@');
+ if (arr1.Length != 2)
+ {
+ return null;
+ }
+ string[] arr21 = arr1[0].Split(':');
+ string[] arr22 = arr1[1].Split(':');
+ if (arr21.Length != 2 || arr22.Length != 2)
+ {
+ return null;
+ }
+
+ item.address = arr22[0];
+ item.port = Utils.ToInt(arr22[1]);
+ item.security = arr21[0];
+ item.id = arr21[1];
+
+ item.network = Global.DefaultNetwork;
+ item.headerType = Global.None;
+ item.remarks = "Alien";
+
+ return item;
+ }
+ }
+}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/Fmt/WireguardFmt.cs b/v2rayn/v2rayN/v2rayN/Handler/Fmt/WireguardFmt.cs
new file mode 100644
index 0000000000..08af7262cc
--- /dev/null
+++ b/v2rayn/v2rayN/v2rayN/Handler/Fmt/WireguardFmt.cs
@@ -0,0 +1,73 @@
+using v2rayN.Enums;
+using v2rayN.Models;
+using v2rayN.Resx;
+
+namespace v2rayN.Handler.Fmt
+{
+ internal class WireguardFmt : BaseFmt
+ {
+ public static ProfileItem? Resolve(string str, out string msg)
+ {
+ msg = ResUI.ConfigurationFormatIncorrect;
+
+ ProfileItem item = new()
+ {
+ configType = EConfigType.Wireguard
+ };
+
+ Uri url = new(str);
+
+ item.address = url.IdnHost;
+ item.port = url.Port;
+ item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+ item.id = Utils.UrlDecode(url.UserInfo);
+
+ var query = Utils.ParseQueryString(url.Query);
+
+ item.publicKey = Utils.UrlDecode(query["publickey"] ?? "");
+ item.path = Utils.UrlDecode(query["reserved"] ?? "");
+ item.requestHost = Utils.UrlDecode(query["address"] ?? "");
+ item.shortId = Utils.UrlDecode(query["mtu"] ?? "");
+
+ return item;
+ }
+
+ public static string? ToUri(ProfileItem? item)
+ {
+ if (item == null) return null;
+ string url = string.Empty;
+
+ string remark = string.Empty;
+ if (!Utils.IsNullOrEmpty(item.remarks))
+ {
+ remark = "#" + Utils.UrlEncode(item.remarks);
+ }
+
+ var dicQuery = new Dictionary();
+ if (!Utils.IsNullOrEmpty(item.publicKey))
+ {
+ dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
+ }
+ if (!Utils.IsNullOrEmpty(item.path))
+ {
+ dicQuery.Add("reserved", Utils.UrlEncode(item.path));
+ }
+ if (!Utils.IsNullOrEmpty(item.requestHost))
+ {
+ dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
+ }
+ if (!Utils.IsNullOrEmpty(item.shortId))
+ {
+ dicQuery.Add("mtu", Utils.UrlEncode(item.shortId));
+ }
+ string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+ url = string.Format("{0}@{1}:{2}",
+ Utils.UrlEncode(item.id),
+ GetIpv6(item.address),
+ item.port);
+ url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
+ return url;
+ }
+ }
+}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/HotkeyHandler.cs b/v2rayn/v2rayN/v2rayN/Handler/HotkeyHandler.cs
index 6ffec9aec2..623f9de26f 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/HotkeyHandler.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/HotkeyHandler.cs
@@ -4,6 +4,7 @@ using System.Text;
using System.Windows;
using System.Windows.Input;
using System.Windows.Interop;
+using v2rayN.Enums;
using v2rayN.Models;
using v2rayN.Resx;
diff --git a/v2rayn/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayn/v2rayN/v2rayN/Handler/LazyConfig.cs
index 04766ffed5..b1061b6d23 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/LazyConfig.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/LazyConfig.cs
@@ -1,4 +1,5 @@
using System.Runtime.Intrinsics.X86;
+using v2rayN.Enums;
using v2rayN.Models;
namespace v2rayN.Handler
diff --git a/v2rayn/v2rayN/v2rayN/Handler/MainFormHandler.cs b/v2rayn/v2rayN/v2rayN/Handler/MainFormHandler.cs
index 5d5d61ddcf..607bafd166 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/MainFormHandler.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/MainFormHandler.cs
@@ -3,6 +3,8 @@ using Splat;
using System.Drawing;
using System.IO;
using System.Windows.Media.Imaging;
+using v2rayN.Enums;
+using v2rayN.Handler.CoreConfig;
using v2rayN.Models;
using v2rayN.Resx;
diff --git a/v2rayn/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayn/v2rayN/v2rayN/Handler/ShareHandler.cs
deleted file mode 100644
index 309bde8917..0000000000
--- a/v2rayn/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ /dev/null
@@ -1,1003 +0,0 @@
-using System.Collections.Specialized;
-using System.Text.RegularExpressions;
-using v2rayN.Models;
-using v2rayN.Resx;
-
-namespace v2rayN.Handler
-{
- internal class ShareHandler
- {
- #region GetShareUrl
-
- ///
- /// GetShareUrl
- ///
- ///
- ///
- public static string? GetShareUrl(ProfileItem item)
- {
- try
- {
- string? url = string.Empty;
-
- url = item.configType switch
- {
- EConfigType.VMess => ShareVmess(item),
- EConfigType.Shadowsocks => ShareShadowsocks(item),
- EConfigType.Socks => ShareSocks(item),
- EConfigType.Trojan => ShareTrojan(item),
- EConfigType.VLESS => ShareVLESS(item),
- EConfigType.Hysteria2 => ShareHysteria2(item),
- EConfigType.Tuic => ShareTuic(item),
- EConfigType.Wireguard => ShareWireguard(item),
- _ => null,
- };
-
- return url;
- }
- catch (Exception ex)
- {
- Logging.SaveLog(ex.Message, ex);
- return "";
- }
- }
-
- private static string ShareVmess(ProfileItem item)
- {
- string url = string.Empty;
-
- VmessQRCode vmessQRCode = new()
- {
- v = item.configVersion,
- ps = item.remarks.TrimEx(),
- add = item.address,
- port = item.port,
- id = item.id,
- aid = item.alterId,
- scy = item.security,
- net = item.network,
- type = item.headerType,
- host = item.requestHost,
- path = item.path,
- tls = item.streamSecurity,
- sni = item.sni,
- alpn = item.alpn,
- fp = item.fingerprint
- };
-
- url = JsonUtils.Serialize(vmessQRCode);
- url = Utils.Base64Encode(url);
- url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
-
- return url;
- }
-
- private static string ShareShadowsocks(ProfileItem item)
- {
- string url = string.Empty;
-
- string remark = string.Empty;
- if (!Utils.IsNullOrEmpty(item.remarks))
- {
- remark = "#" + Utils.UrlEncode(item.remarks);
- }
- //url = string.Format("{0}:{1}@{2}:{3}",
- // item.security,
- // item.id,
- // item.address,
- // item.port);
- //url = Utile.Base64Encode(url);
- //new Sip002
- var pw = Utils.Base64Encode($"{item.security}:{item.id}");
- url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
- url = $"{Global.ProtocolShares[EConfigType.Shadowsocks]}{url}{remark}";
- return url;
- }
-
- private static string ShareSocks(ProfileItem item)
- {
- string url = string.Empty;
- string remark = string.Empty;
- if (!Utils.IsNullOrEmpty(item.remarks))
- {
- remark = "#" + Utils.UrlEncode(item.remarks);
- }
- //url = string.Format("{0}:{1}@{2}:{3}",
- // item.security,
- // item.id,
- // item.address,
- // item.port);
- //url = Utile.Base64Encode(url);
- //new
- var pw = Utils.Base64Encode($"{item.security}:{item.id}");
- url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
- url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
- return url;
- }
-
- private static string ShareTrojan(ProfileItem item)
- {
- string url = string.Empty;
- string remark = string.Empty;
- if (!Utils.IsNullOrEmpty(item.remarks))
- {
- remark = "#" + Utils.UrlEncode(item.remarks);
- }
- var dicQuery = new Dictionary();
- GetStdTransport(item, null, ref dicQuery);
- string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
-
- url = string.Format("{0}@{1}:{2}",
- item.id,
- GetIpv6(item.address),
- item.port);
- url = $"{Global.ProtocolShares[EConfigType.Trojan]}{url}{query}{remark}";
- return url;
- }
-
- private static string ShareVLESS(ProfileItem item)
- {
- string url = string.Empty;
- string remark = string.Empty;
- if (!Utils.IsNullOrEmpty(item.remarks))
- {
- remark = "#" + Utils.UrlEncode(item.remarks);
- }
- var dicQuery = new Dictionary();
- if (!Utils.IsNullOrEmpty(item.security))
- {
- dicQuery.Add("encryption", item.security);
- }
- else
- {
- dicQuery.Add("encryption", Global.None);
- }
- GetStdTransport(item, Global.None, ref dicQuery);
- string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
-
- url = string.Format("{0}@{1}:{2}",
- item.id,
- GetIpv6(item.address),
- item.port);
- url = $"{Global.ProtocolShares[EConfigType.VLESS]}{url}{query}{remark}";
- return url;
- }
-
- private static string ShareHysteria2(ProfileItem item)
- {
- string url = string.Empty;
- string remark = string.Empty;
- if (!Utils.IsNullOrEmpty(item.remarks))
- {
- remark = "#" + Utils.UrlEncode(item.remarks);
- }
- var dicQuery = new Dictionary();
- if (!Utils.IsNullOrEmpty(item.sni))
- {
- dicQuery.Add("sni", item.sni);
- }
- if (!Utils.IsNullOrEmpty(item.alpn))
- {
- dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
- }
- if (!Utils.IsNullOrEmpty(item.path))
- {
- dicQuery.Add("obfs", "salamander");
- dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
- }
- dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
-
- string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
-
- url = string.Format("{0}@{1}:{2}",
- item.id,
- GetIpv6(item.address),
- item.port);
- url = $"{Global.ProtocolShares[EConfigType.Hysteria2]}{url}/{query}{remark}";
- return url;
- }
-
- private static string ShareTuic(ProfileItem item)
- {
- string url = string.Empty;
- string remark = string.Empty;
- if (!Utils.IsNullOrEmpty(item.remarks))
- {
- remark = "#" + Utils.UrlEncode(item.remarks);
- }
- var dicQuery = new Dictionary();
- if (!Utils.IsNullOrEmpty(item.sni))
- {
- dicQuery.Add("sni", item.sni);
- }
- if (!Utils.IsNullOrEmpty(item.alpn))
- {
- dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
- }
- dicQuery.Add("congestion_control", item.headerType);
-
- string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
-
- url = string.Format("{0}@{1}:{2}",
- $"{item.id}:{item.security}",
- GetIpv6(item.address),
- item.port);
- url = $"{Global.ProtocolShares[EConfigType.Tuic]}{url}{query}{remark}";
- return url;
- }
-
- private static string ShareWireguard(ProfileItem item)
- {
- string url = string.Empty;
- string remark = string.Empty;
- if (!Utils.IsNullOrEmpty(item.remarks))
- {
- remark = "#" + Utils.UrlEncode(item.remarks);
- }
-
- var dicQuery = new Dictionary();
- if (!Utils.IsNullOrEmpty(item.publicKey))
- {
- dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
- }
- if (!Utils.IsNullOrEmpty(item.path))
- {
- dicQuery.Add("reserved", Utils.UrlEncode(item.path));
- }
- if (!Utils.IsNullOrEmpty(item.requestHost))
- {
- dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
- }
- if (!Utils.IsNullOrEmpty(item.shortId))
- {
- dicQuery.Add("mtu", Utils.UrlEncode(item.shortId));
- }
- string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
-
- url = string.Format("{0}@{1}:{2}",
- Utils.UrlEncode(item.id),
- GetIpv6(item.address),
- item.port);
- url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
- return url;
- }
-
- private static string GetIpv6(string address)
- {
- if (Utils.IsIpv6(address))
- {
- // 检查地址是否已经被方括号包围，如果没有，则添加方括号
- return address.StartsWith('[') && address.EndsWith(']') ? address : $"[{address}]";
- }
- return address; // 如果不是IPv6地址，直接返回原地址
- }
-
- private static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary dicQuery)
- {
- if (!Utils.IsNullOrEmpty(item.flow))
- {
- dicQuery.Add("flow", item.flow);
- }
-
- if (!Utils.IsNullOrEmpty(item.streamSecurity))
- {
- dicQuery.Add("security", item.streamSecurity);
- }
- else
- {
- if (securityDef != null)
- {
- dicQuery.Add("security", securityDef);
- }
- }
- if (!Utils.IsNullOrEmpty(item.sni))
- {
- dicQuery.Add("sni", item.sni);
- }
- if (!Utils.IsNullOrEmpty(item.alpn))
- {
- dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
- }
- if (!Utils.IsNullOrEmpty(item.fingerprint))
- {
- dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
- }
- if (!Utils.IsNullOrEmpty(item.publicKey))
- {
- dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
- }
- if (!Utils.IsNullOrEmpty(item.shortId))
- {
- dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
- }
- if (!Utils.IsNullOrEmpty(item.spiderX))
- {
- dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
- }
-
- dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
-
- switch (item.network)
- {
- case nameof(ETransport.tcp):
- dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
- if (!Utils.IsNullOrEmpty(item.requestHost))
- {
- dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
- }
- break;
-
- case nameof(ETransport.kcp):
- dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
- if (!Utils.IsNullOrEmpty(item.path))
- {
- dicQuery.Add("seed", Utils.UrlEncode(item.path));
- }
- break;
-
- case nameof(ETransport.ws):
- case nameof(ETransport.httpupgrade):
- if (!Utils.IsNullOrEmpty(item.requestHost))
- {
- dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
- }
- if (!Utils.IsNullOrEmpty(item.path))
- {
- dicQuery.Add("path", Utils.UrlEncode(item.path));
- }
- break;
-
- case nameof(ETransport.http):
- case nameof(ETransport.h2):
- dicQuery["type"] = nameof(ETransport.http);
- if (!Utils.IsNullOrEmpty(item.requestHost))
- {
- dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
- }
- if (!Utils.IsNullOrEmpty(item.path))
- {
- dicQuery.Add("path", Utils.UrlEncode(item.path));
- }
- break;
-
- case nameof(ETransport.quic):
- dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
- dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
- dicQuery.Add("key", Utils.UrlEncode(item.path));
- break;
-
- case nameof(ETransport.grpc):
- if (!Utils.IsNullOrEmpty(item.path))
- {
- dicQuery.Add("authority", Utils.UrlEncode(item.requestHost));
- dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
- if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
- {
- dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
- }
- }
- break;
- }
- return 0;
- }
-
- #endregion GetShareUrl
-
- #region ImportShareUrl
-
- ///
- /// 从剪贴板导入URL
- ///
- ///
- ///
- public static ProfileItem? ImportFromClipboardConfig(string clipboardData, out string msg)
- {
- msg = ResUI.ConfigurationFormatIncorrect;
- ProfileItem? profileItem;
-
- try
- {
- string result = clipboardData.TrimEx();
- if (Utils.IsNullOrEmpty(result))
- {
- msg = ResUI.FailedReadConfiguration;
- return null;
- }
-
- if (result.StartsWith(Global.ProtocolShares[EConfigType.VMess]))
- {
- int indexSplit = result.IndexOf("?");
- if (indexSplit > 0)
- {
- profileItem = ResolveStdVmess(result) ?? ResolveVmess4Kitsunebi(result);
- }
- else
- {
- profileItem = ResolveVmess(result, out msg);
- }
- }
- else if (result.StartsWith(Global.ProtocolShares[EConfigType.Shadowsocks]))
- {
- profileItem = ResolveSSLegacy(result) ?? ResolveSip002(result);
- if (profileItem == null)
- {
- return null;
- }
- if (profileItem.address.Length == 0 || profileItem.port == 0 || profileItem.security.Length == 0 || profileItem.id.Length == 0)
- {
- return null;
- }
-
- profileItem.configType = EConfigType.Shadowsocks;
- }
- else if (result.StartsWith(Global.ProtocolShares[EConfigType.Socks]))
- {
- profileItem = ResolveSocksNew(result) ?? ResolveSocks(result);
- if (profileItem == null)
- {
- return null;
- }
- if (profileItem.address.Length == 0 || profileItem.port == 0)
- {
- return null;
- }
-
- profileItem.configType = EConfigType.Socks;
- }
- else if (result.StartsWith(Global.ProtocolShares[EConfigType.Trojan]))
- {
- profileItem = ResolveTrojan(result);
- }
- else if (result.StartsWith(Global.ProtocolShares[EConfigType.VLESS]))
- {
- profileItem = ResolveStdVLESS(result);
- }
- else if (result.StartsWith(Global.ProtocolShares[EConfigType.Hysteria2]) || result.StartsWith(Global.Hysteria2ProtocolShare))
- {
- profileItem = ResolveHysteria2(result);
- }
- else if (result.StartsWith(Global.ProtocolShares[EConfigType.Tuic]))
- {
- profileItem = ResolveTuic(result);
- }
- else if (result.StartsWith(Global.ProtocolShares[EConfigType.Wireguard]))
- {
- profileItem = ResolveWireguard(result);
- }
- else
- {
- msg = ResUI.NonvmessOrssProtocol;
- return null;
- }
- }
- catch (Exception ex)
- {
- Logging.SaveLog(ex.Message, ex);
- msg = ResUI.Incorrectconfiguration;
- return null;
- }
-
- return profileItem;
- }
-
- private static ProfileItem? ResolveVmess(string result, out string msg)
- {
- msg = string.Empty;
- var profileItem = new ProfileItem
- {
- configType = EConfigType.VMess
- };
-
- result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
- result = Utils.Base64Decode(result);
-
- //转成Json
- VmessQRCode? vmessQRCode = JsonUtils.Deserialize(result);
- if (vmessQRCode == null)
- {
- msg = ResUI.FailedConversionConfiguration;
- return null;
- }
-
- profileItem.network = Global.DefaultNetwork;
- profileItem.headerType = Global.None;
-
- profileItem.configVersion = Utils.ToInt(vmessQRCode.v);
- profileItem.remarks = Utils.ToString(vmessQRCode.ps);
- profileItem.address = Utils.ToString(vmessQRCode.add);
- profileItem.port = Utils.ToInt(vmessQRCode.port);
- profileItem.id = Utils.ToString(vmessQRCode.id);
- profileItem.alterId = Utils.ToInt(vmessQRCode.aid);
- profileItem.security = Utils.ToString(vmessQRCode.scy);
-
- profileItem.security = !Utils.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
- if (!Utils.IsNullOrEmpty(vmessQRCode.net))
- {
- profileItem.network = vmessQRCode.net;
- }
- if (!Utils.IsNullOrEmpty(vmessQRCode.type))
- {
- profileItem.headerType = vmessQRCode.type;
- }
-
- profileItem.requestHost = Utils.ToString(vmessQRCode.host);
- profileItem.path = Utils.ToString(vmessQRCode.path);
- profileItem.streamSecurity = Utils.ToString(vmessQRCode.tls);
- profileItem.sni = Utils.ToString(vmessQRCode.sni);
- profileItem.alpn = Utils.ToString(vmessQRCode.alpn);
- profileItem.fingerprint = Utils.ToString(vmessQRCode.fp);
-
- return profileItem;
- }
-
- private static ProfileItem? ResolveVmess4Kitsunebi(string result)
- {
- ProfileItem profileItem = new()
- {
- configType = EConfigType.VMess
- };
- result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
- int indexSplit = result.IndexOf("?");
- if (indexSplit > 0)
- {
- result = result[..indexSplit];
- }
- result = Utils.Base64Decode(result);
-
- string[] arr1 = result.Split('@');
- if (arr1.Length != 2)
- {
- return null;
- }
- string[] arr21 = arr1[0].Split(':');
- string[] arr22 = arr1[1].Split(':');
- if (arr21.Length != 2 || arr22.Length != 2)
- {
- return null;
- }
-
- profileItem.address = arr22[0];
- profileItem.port = Utils.ToInt(arr22[1]);
- profileItem.security = arr21[0];
- profileItem.id = arr21[1];
-
- profileItem.network = Global.DefaultNetwork;
- profileItem.headerType = Global.None;
- profileItem.remarks = "Alien";
-
- return profileItem;
- }
-
- private static ProfileItem? ResolveStdVmess(string result)
- {
- ProfileItem i = new()
- {
- configType = EConfigType.VMess,
- security = "auto"
- };
-
- Uri u = new(result);
-
- i.address = u.IdnHost;
- i.port = u.Port;
- i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
- var query = Utils.ParseQueryString(u.Query);
-
- var m = StdVmessUserInfo.Match(u.UserInfo);
- if (!m.Success) return null;
-
- i.id = m.Groups["id"].Value;
-
- if (m.Groups["streamSecurity"].Success)
- {
- i.streamSecurity = m.Groups["streamSecurity"].Value;
- }
- switch (i.streamSecurity)
- {
- case Global.StreamSecurity:
- break;
-
- default:
- if (!Utils.IsNullOrEmpty(i.streamSecurity))
- return null;
- break;
- }
-
- i.network = m.Groups["network"].Value;
- switch (i.network)
- {
- case nameof(ETransport.tcp):
- string t1 = query["type"] ?? Global.None;
- i.headerType = t1;
- break;
-
- case nameof(ETransport.kcp):
- i.headerType = query["type"] ?? Global.None;
- break;
-
- case nameof(ETransport.ws):
- case nameof(ETransport.httpupgrade):
- string p1 = query["path"] ?? "/";
- string h1 = query["host"] ?? "";
- i.requestHost = Utils.UrlDecode(h1);
- i.path = p1;
- break;
-
- case nameof(ETransport.http):
- case nameof(ETransport.h2):
- i.network = nameof(ETransport.h2);
- string p2 = query["path"] ?? "/";
- string h2 = query["host"] ?? "";
- i.requestHost = Utils.UrlDecode(h2);
- i.path = p2;
- break;
-
- case nameof(ETransport.quic):
- string s = query["security"] ?? Global.None;
- string k = query["key"] ?? "";
- string t3 = query["type"] ?? Global.None;
- i.headerType = t3;
- i.requestHost = Utils.UrlDecode(s);
- i.path = k;
- break;
-
- default:
- return null;
- }
-
- return i;
- }
-
- private static ProfileItem? ResolveSip002(string result)
- {
- Uri parsedUrl;
- try
- {
- parsedUrl = new Uri(result);
- }
- catch (UriFormatException)
- {
- return null;
- }
- ProfileItem server = new()
- {
- remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
- address = parsedUrl.IdnHost,
- port = parsedUrl.Port,
- };
- string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.UriEscaped);
- //2022-blake3
- if (rawUserInfo.Contains(':'))
- {
- string[] userInfoParts = rawUserInfo.Split(new[] { ':' }, 2);
- if (userInfoParts.Length != 2)
- {
- return null;
- }
- server.security = userInfoParts[0];
- server.id = Utils.UrlDecode(userInfoParts[1]);
- }
- else
- {
- // parse base64 UserInfo
- string userInfo = Utils.Base64Decode(rawUserInfo);
- string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
- if (userInfoParts.Length != 2)
- {
- return null;
- }
- server.security = userInfoParts[0];
- server.id = userInfoParts[1];
- }
-
- var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
- if (queryParameters["plugin"] != null)
- {
- //obfs-host exists
- var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
- if (queryParameters["plugin"].Contains("obfs=http") && !Utils.IsNullOrEmpty(obfsHost))
- {
- obfsHost = obfsHost?.Replace("obfs-host=", "");
- server.network = Global.DefaultNetwork;
- server.headerType = Global.TcpHeaderHttp;
- server.requestHost = obfsHost ?? "";
- }
- else
- {
- return null;
- }
- }
-
- return server;
- }
-
- private static readonly Regex UrlFinder = new(@"ss://(?[A-Za-z0-9+-/=_]+)(?:#(?\S+))?", RegexOptions.IgnoreCase | RegexOptions.Compiled);
- private static readonly Regex DetailsParser = new(@"^((?.+?):(?.*)@(?.+?):(?\d+?))$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-
- private static ProfileItem? ResolveSSLegacy(string result)
- {
- var match = UrlFinder.Match(result);
- if (!match.Success)
- return null;
-
- ProfileItem server = new();
- var base64 = match.Groups["base64"].Value.TrimEnd('/');
- var tag = match.Groups["tag"].Value;
- if (!Utils.IsNullOrEmpty(tag))
- {
- server.remarks = Utils.UrlDecode(tag);
- }
- Match details;
- try
- {
- details = DetailsParser.Match(Utils.Base64Decode(base64));
- }
- catch (FormatException)
- {
- return null;
- }
- if (!details.Success)
- return null;
- server.security = details.Groups["method"].Value;
- server.id = details.Groups["password"].Value;
- server.address = details.Groups["hostname"].Value;
- server.port = Utils.ToInt(details.Groups["port"].Value);
- return server;
- }
-
- private static readonly Regex StdVmessUserInfo = new(
- @"^(?[a-z]+)(\+(?[a-z]+))?:(?[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$", RegexOptions.Compiled);
-
- private static ProfileItem? ResolveSocks(string result)
- {
- ProfileItem profileItem = new()
- {
- configType = EConfigType.Socks
- };
- result = result[Global.ProtocolShares[EConfigType.Socks].Length..];
- //remark
- int indexRemark = result.IndexOf("#");
- if (indexRemark > 0)
- {
- try
- {
- profileItem.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
- }
- catch { }
- result = result[..indexRemark];
- }
- //part decode
- int indexS = result.IndexOf("@");
- if (indexS > 0)
- {
- }
- else
- {
- result = Utils.Base64Decode(result);
- }
-
- string[] arr1 = result.Split('@');
- if (arr1.Length != 2)
- {
- return null;
- }
- string[] arr21 = arr1[0].Split(':');
- //string[] arr22 = arr1[1].Split(':');
- int indexPort = arr1[1].LastIndexOf(":");
- if (arr21.Length != 2 || indexPort < 0)
- {
- return null;
- }
- profileItem.address = arr1[1][..indexPort];
- profileItem.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
- profileItem.security = arr21[0];
- profileItem.id = arr21[1];
-
- return profileItem;
- }
-
- private static ProfileItem? ResolveSocksNew(string result)
- {
- Uri parsedUrl;
- try
- {
- parsedUrl = new Uri(result);
- }
- catch (UriFormatException)
- {
- return null;
- }
- ProfileItem server = new()
- {
- remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
- address = parsedUrl.IdnHost,
- port = parsedUrl.Port,
- };
-
- // parse base64 UserInfo
- string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
- string userInfo = Utils.Base64Decode(rawUserInfo);
- string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
- if (userInfoParts.Length == 2)
- {
- server.security = userInfoParts[0];
- server.id = userInfoParts[1];
- }
-
- return server;
- }
-
- private static ProfileItem ResolveTrojan(string result)
- {
- ProfileItem item = new()
- {
- configType = EConfigType.Trojan
- };
-
- Uri url = new(result);
-
- item.address = url.IdnHost;
- item.port = url.Port;
- item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
- item.id = Utils.UrlDecode(url.UserInfo);
-
- var query = Utils.ParseQueryString(url.Query);
- ResolveStdTransport(query, ref item);
-
- return item;
- }
-
- private static ProfileItem ResolveStdVLESS(string result)
- {
- ProfileItem item = new()
- {
- configType = EConfigType.VLESS,
- security = Global.None
- };
-
- Uri url = new(result);
-
- item.address = url.IdnHost;
- item.port = url.Port;
- item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
- item.id = Utils.UrlDecode(url.UserInfo);
-
- var query = Utils.ParseQueryString(url.Query);
- item.security = query["encryption"] ?? Global.None;
- item.streamSecurity = query["security"] ?? "";
- ResolveStdTransport(query, ref item);
-
- return item;
- }
-
- private static ProfileItem ResolveHysteria2(string result)
- {
- ProfileItem item = new()
- {
- configType = EConfigType.Hysteria2
- };
-
- Uri url = new(result);
-
- item.address = url.IdnHost;
- item.port = url.Port;
- item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
- item.id = Utils.UrlDecode(url.UserInfo);
-
- var query = Utils.ParseQueryString(url.Query);
- ResolveStdTransport(query, ref item);
- item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
- item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
-
- return item;
- }
-
- private static ProfileItem ResolveTuic(string result)
- {
- ProfileItem item = new()
- {
- configType = EConfigType.Tuic
- };
-
- Uri url = new(result);
-
- item.address = url.IdnHost;
- item.port = url.Port;
- item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
- var userInfoParts = url.UserInfo.Split(new[] { ':' }, 2);
- if (userInfoParts.Length == 2)
- {
- item.id = userInfoParts[0];
- item.security = userInfoParts[1];
- }
-
- var query = Utils.ParseQueryString(url.Query);
- ResolveStdTransport(query, ref item);
- item.headerType = query["congestion_control"] ?? "";
-
- return item;
- }
-
- private static ProfileItem ResolveWireguard(string result)
- {
- ProfileItem item = new()
- {
- configType = EConfigType.Wireguard
- };
-
- Uri url = new(result);
-
- item.address = url.IdnHost;
- item.port = url.Port;
- item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
- item.id = Utils.UrlDecode(url.UserInfo);
-
- var query = Utils.ParseQueryString(url.Query);
-
- item.publicKey = Utils.UrlDecode(query["publickey"] ?? "");
- item.path = Utils.UrlDecode(query["reserved"] ?? "");
- item.requestHost = Utils.UrlDecode(query["address"] ?? "");
- item.shortId = Utils.UrlDecode(query["mtu"] ?? "");
-
- return item;
- }
-
- private static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
- {
- item.flow = query["flow"] ?? "";
- item.streamSecurity = query["security"] ?? "";
- item.sni = query["sni"] ?? "";
- item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
- item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
- item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
- item.shortId = Utils.UrlDecode(query["sid"] ?? "");
- item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
-
- item.network = query["type"] ?? nameof(ETransport.tcp);
- switch (item.network)
- {
- case nameof(ETransport.tcp):
- item.headerType = query["headerType"] ?? Global.None;
- item.requestHost = Utils.UrlDecode(query["host"] ?? "");
-
- break;
-
- case nameof(ETransport.kcp):
- item.headerType = query["headerType"] ?? Global.None;
- item.path = Utils.UrlDecode(query["seed"] ?? "");
- break;
-
- case nameof(ETransport.ws):
- case nameof(ETransport.httpupgrade):
- item.requestHost = Utils.UrlDecode(query["host"] ?? "");
- item.path = Utils.UrlDecode(query["path"] ?? "/");
- break;
-
- case nameof(ETransport.http):
- case nameof(ETransport.h2):
- item.network = nameof(ETransport.h2);
- item.requestHost = Utils.UrlDecode(query["host"] ?? "");
- item.path = Utils.UrlDecode(query["path"] ?? "/");
- break;
-
- case nameof(ETransport.quic):
- item.headerType = query["headerType"] ?? Global.None;
- item.requestHost = query["quicSecurity"] ?? Global.None;
- item.path = Utils.UrlDecode(query["key"] ?? "");
- break;
-
- case nameof(ETransport.grpc):
- item.requestHost = Utils.UrlDecode(query["authority"] ?? "");
- item.path = Utils.UrlDecode(query["serviceName"] ?? "");
- item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
- break;
-
- default:
- break;
- }
- return 0;
- }
-
- #endregion ImportShareUrl
- }
-}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Handler/SpeedtestHandler.cs b/v2rayn/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
index e30118a83d..f89515050c 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -2,6 +2,7 @@
using System.Diagnostics;
using System.Net;
using System.Net.Sockets;
+using v2rayN.Enums;
using v2rayN.Models;
using v2rayN.Resx;
diff --git a/v2rayn/v2rayN/v2rayN/Handler/StatisticsSingbox.cs b/v2rayn/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
index a845004cf4..bc9ac0e975 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
@@ -1,5 +1,6 @@
using System.Net.WebSockets;
using System.Text;
+using v2rayN.Enums;
using v2rayN.Models;
namespace v2rayN.Handler
diff --git a/v2rayn/v2rayN/v2rayN/Handler/StatisticsV2ray.cs b/v2rayn/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
index 9bf83f970e..67385453ec 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/StatisticsV2ray.cs
@@ -1,6 +1,7 @@
using Grpc.Core;
using Grpc.Net.Client;
using ProtosLib.Statistics;
+using v2rayN.Enums;
using v2rayN.Models;
namespace v2rayN.Handler
diff --git a/v2rayn/v2rayN/v2rayN/Handler/SysProxyHandle.cs b/v2rayn/v2rayN/v2rayN/Handler/SysProxyHandle.cs
index d61313984b..679c3aa5cd 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/SysProxyHandle.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/SysProxyHandle.cs
@@ -1,4 +1,5 @@
using PacLib;
+using v2rayN.Enums;
using v2rayN.Models;
namespace v2rayN.Handler
diff --git a/v2rayn/v2rayN/v2rayN/Handler/UpdateHandle.cs b/v2rayn/v2rayN/v2rayN/Handler/UpdateHandle.cs
index 175b3af257..996ded0a69 100644
--- a/v2rayn/v2rayN/v2rayN/Handler/UpdateHandle.cs
+++ b/v2rayn/v2rayN/v2rayN/Handler/UpdateHandle.cs
@@ -6,6 +6,7 @@ using System.Runtime.InteropServices;
using System.Text;
using System.Text.RegularExpressions;
using System.Windows;
+using v2rayN.Enums;
using v2rayN.Models;
using v2rayN.Resx;
@@ -299,9 +300,6 @@ namespace v2rayN.Handler
{
await UpdateGeoFile("geosite", _config, update);
await UpdateGeoFile("geoip", _config, update);
-
- //await UpdateGeoFile4Singbox("geosite", _config, false, update);
- //await UpdateGeoFile4Singbox("geoip", _config, true, update);
});
}
@@ -327,7 +325,7 @@ namespace v2rayN.Handler
var result = await (new DownloadHandle()).DownloadStringAsync(url, true, "");
if (!Utils.IsNullOrEmpty(result))
{
- responseHandler(type, result, preRelease);
+ ResponseHandler(type, result, preRelease);
}
else
{
@@ -345,7 +343,7 @@ namespace v2rayN.Handler
///
/// 获取V2RayCore版本
///
- private SemanticVersion getCoreVersion(ECoreType type)
+ private SemanticVersion GetCoreVersion(ECoreType type)
{
try
{
@@ -410,7 +408,7 @@ namespace v2rayN.Handler
}
}
- private void responseHandler(ECoreType type, string gitHubReleaseApi, bool preRelease)
+ private void ResponseHandler(ECoreType type, string gitHubReleaseApi, bool preRelease)
{
try
{
@@ -431,7 +429,7 @@ namespace v2rayN.Handler
case ECoreType.Xray:
case ECoreType.v2fly_v5:
{
- curVersion = getCoreVersion(type);
+ curVersion = GetCoreVersion(type);
message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
string osBit = "64";
switch (RuntimeInformation.ProcessArchitecture)
@@ -456,7 +454,7 @@ namespace v2rayN.Handler
case ECoreType.clash_meta:
case ECoreType.mihomo:
{
- curVersion = getCoreVersion(type);
+ curVersion = GetCoreVersion(type);
message = string.Format(ResUI.IsLatestCore, type, curVersion);
switch (RuntimeInformation.ProcessArchitecture)
{
@@ -477,7 +475,7 @@ namespace v2rayN.Handler
}
case ECoreType.sing_box:
{
- curVersion = getCoreVersion(type);
+ curVersion = GetCoreVersion(type);
message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
switch (RuntimeInformation.ProcessArchitecture)
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/Config.cs b/v2rayn/v2rayN/v2rayN/Models/Config.cs
index d763f48530..0d411d66b8 100644
--- a/v2rayn/v2rayN/v2rayN/Models/Config.cs
+++ b/v2rayn/v2rayN/v2rayN/Models/Config.cs
@@ -1,4 +1,6 @@
-namespace v2rayN.Models
+using v2rayN.Enums;
+
+namespace v2rayN.Models
{
///
/// 本软件配置文件实体类
diff --git a/v2rayn/v2rayN/v2rayN/Models/ConfigItems.cs b/v2rayn/v2rayN/v2rayN/Models/ConfigItems.cs
index af768b498d..a986dbf93f 100644
--- a/v2rayn/v2rayN/v2rayN/Models/ConfigItems.cs
+++ b/v2rayn/v2rayN/v2rayN/Models/ConfigItems.cs
@@ -1,4 +1,5 @@
using System.Windows.Input;
+using v2rayN.Enums;
namespace v2rayN.Models
{
@@ -186,7 +187,7 @@ namespace v2rayN.Models
public string domainStrategy4Singbox { get; set; }
public string domainMatcher { get; set; }
public string routingIndexId { get; set; }
- public bool enableRoutingAdvanced { get; set; }
+ public bool enableRoutingAdvanced { get; set; }
}
[Serializable]
diff --git a/v2rayn/v2rayN/v2rayN/Models/ConfigOld.cs b/v2rayn/v2rayN/v2rayN/Models/ConfigOld.cs
deleted file mode 100644
index 9f27b610b1..0000000000
--- a/v2rayn/v2rayN/v2rayN/Models/ConfigOld.cs
+++ /dev/null
@@ -1,440 +0,0 @@
-namespace v2rayN.Models
-{
- [Serializable]
- public class ConfigOld
- {
- #region property
-
- ///
- /// 允许日志
- ///
- public bool logEnabled
- {
- get; set;
- }
-
- ///
- /// 日志等级
- ///
- public string loglevel
- {
- get; set;
- }
-
- public string indexId
- {
- get; set;
- }
-
- ///
- /// 允许Mux多路复用
- ///
- public bool muxEnabled
- {
- get; set;
- }
-
- ///
- ///
- ///
- public ESysProxyType sysProxyType
- {
- get; set;
- }
-
- ///
- /// 启用实时网速和流量统计
- ///
- public bool enableStatistics
- {
- get; set;
- }
-
- ///
- /// 去重时优先保留较旧（顶部）节点
- ///
- public bool keepOlderDedupl
- {
- get; set;
- }
-
- ///
- /// 视图刷新率
- ///
- public int statisticsFreshRate
- {
- get; set;
- }
-
- ///
- /// 自定义远程DNS
- ///
- public string remoteDNS
- {
- get; set;
- }
-
- ///
- /// Outbound Freedom domainStrategy
- ///
- public string domainStrategy4Freedom
- {
- get; set;
- }
-
- ///
- /// 是否允许不安全连接
- ///
- public bool defAllowInsecure
- {
- get; set;
- }
-
- ///
- /// 域名解析策略
- ///
- public string domainStrategy
- {
- get; set;
- }
-
- public string domainMatcher
- {
- get; set;
- }
-
- public int routingIndex
- {
- get; set;
- }
-
- public bool enableRoutingAdvanced
- {
- get; set;
- }
-
- public bool ignoreGeoUpdateCore
- {
- get; set;
- }
-
- ///
- /// systemProxyExceptions
- ///
- public string systemProxyExceptions
- {
- get; set;
- }
-
- public string systemProxyAdvancedProtocol { get; set; }
-
- public int autoUpdateInterval { get; set; } = 0;
-
- public int autoUpdateSubInterval { get; set; } = 0;
-
- public bool checkPreReleaseUpdate { get; set; } = false;
-
- public bool enableSecurityProtocolTls13
- {
- get; set;
- }
-
- public int trayMenuServersLimit { get; set; }
-
- #endregion property
-
- #region other entities
-
- ///
- /// 本地监听
- ///
- public List inbound
- {
- get; set;
- }
-
- ///
- /// vmess服务器信息
- ///
- public List vmess
- {
- get; set;
- }
-
- ///
- /// KcpItem
- ///
- public KcpItem kcpItem
- {
- get; set;
- }
-
- ///
- /// 订阅
- ///
- public List subItem
- {
- get; set;
- }
-
- ///
- /// UI
- ///
- public UIItem uiItem
- {
- get; set;
- }
-
- public List routings
- {
- get; set;
- }
-
- public ConstItem constItem
- {
- get; set;
- }
-
- public List globalHotkeys
- {
- get; set;
- }
-
- public List coreTypeItem
- {
- get; set;
- }
-
- #endregion other entities
- }
-
- [Serializable]
- public class VmessItem
- {
- public VmessItem()
- {
- indexId = string.Empty;
- configType = EConfigType.VMess;
- configVersion = 2;
- sort = 0;
- address = string.Empty;
- port = 0;
- id = string.Empty;
- alterId = 0;
- security = string.Empty;
- network = string.Empty;
- remarks = string.Empty;
- headerType = string.Empty;
- requestHost = string.Empty;
- path = string.Empty;
- streamSecurity = string.Empty;
- allowInsecure = string.Empty;
- testResult = string.Empty;
- subid = string.Empty;
- flow = string.Empty;
- groupId = string.Empty;
- }
-
- public string indexId
- {
- get; set;
- }
-
- ///
- /// config type(1=normal,2=custom)
- ///
- public EConfigType configType
- {
- get; set;
- }
-
- ///
- /// 版本(现在=2)
- ///
- public int configVersion
- {
- get; set;
- }
-
- public int sort
- {
- get; set;
- }
-
- ///
- /// 远程服务器地址
- ///
- public string address
- {
- get; set;
- }
-
- ///
- /// 远程服务器端口
- ///
- public int port
- {
- get; set;
- }
-
- ///
- /// 远程服务器ID
- ///
- public string id
- {
- get; set;
- }
-
- ///
- /// 远程服务器额外ID
- ///
- public int alterId
- {
- get; set;
- }
-
- ///
- /// 本地安全策略
- ///
- public string security
- {
- get; set;
- }
-
- ///
- /// tcp,kcp,ws,h2,quic
- ///
- public string network
- {
- get; set;
- }
-
- ///
- ///
- ///
- public string remarks
- {
- get; set;
- }
-
- ///
- /// 伪装类型
- ///
- public string headerType
- {
- get; set;
- }
-
- ///
- /// 伪装的域名
- ///
- public string requestHost
- {
- get; set;
- }
-
- ///
- /// ws h2 path
- ///
- public string path
- {
- get; set;
- }
-
- ///
- /// 传输层安全
- ///
- public string streamSecurity
- {
- get; set;
- }
-
- ///
- /// 是否允许不安全连接（用于客户端）
- ///
- public string allowInsecure
- {
- get; set;
- }
-
- ///
- ///
- ///
- public string testResult
- {
- get; set;
- }
-
- ///
- /// SubItem id
- ///
- public string subid
- {
- get; set;
- }
-
- ///
- /// VLESS flow
- ///
- public string flow
- {
- get; set;
- }
-
- ///
- /// tls sni
- ///
- public string sni
- {
- get; set;
- }
-
- public string groupId
- {
- get; set;
- } = string.Empty;
-
- public ECoreType? coreType
- {
- get; set;
- }
-
- public int preSocksPort
- {
- get; set;
- }
-
- public string fingerprint { get; set; }
- }
-
- [Serializable]
- public class RoutingItemOld
- {
- public string remarks
- {
- get; set;
- }
-
- public string url
- {
- get; set;
- }
-
- public List rules
- {
- get; set;
- }
-
- public bool enabled { get; set; } = true;
-
- public bool locked
- {
- get; set;
- }
-
- public string customIcon
- {
- get; set;
- }
- }
-}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/Models/CoreInfo.cs b/v2rayn/v2rayN/v2rayN/Models/CoreInfo.cs
index 00ecb3fdef..ad773c8ce5 100644
--- a/v2rayn/v2rayN/v2rayN/Models/CoreInfo.cs
+++ b/v2rayn/v2rayN/v2rayN/Models/CoreInfo.cs
@@ -1,4 +1,6 @@
-namespace v2rayN.Models
+using v2rayN.Enums;
+
+namespace v2rayN.Models
{
[Serializable]
public class CoreInfo
diff --git a/v2rayn/v2rayN/v2rayN/Models/DNSItem.cs b/v2rayn/v2rayN/v2rayN/Models/DNSItem.cs
index 315de91d3b..c8c27738d6 100644
--- a/v2rayn/v2rayN/v2rayN/Models/DNSItem.cs
+++ b/v2rayn/v2rayN/v2rayN/Models/DNSItem.cs
@@ -1,4 +1,5 @@
using SQLite;
+using v2rayN.Enums;
namespace v2rayN.Models
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/ProfileItem.cs b/v2rayn/v2rayN/v2rayN/Models/ProfileItem.cs
index 9118abff07..aea244e84c 100644
--- a/v2rayn/v2rayN/v2rayN/Models/ProfileItem.cs
+++ b/v2rayn/v2rayN/v2rayN/Models/ProfileItem.cs
@@ -1,4 +1,5 @@
using SQLite;
+using v2rayN.Enums;
namespace v2rayN.Models
{
diff --git a/v2rayn/v2rayN/v2rayN/Models/ServerTestItem.cs b/v2rayn/v2rayN/v2rayN/Models/ServerTestItem.cs
index 3955da7764..8faea95ee4 100644
--- a/v2rayn/v2rayN/v2rayN/Models/ServerTestItem.cs
+++ b/v2rayn/v2rayN/v2rayN/Models/ServerTestItem.cs
@@ -1,4 +1,6 @@
-namespace v2rayN.Models
+using v2rayN.Enums;
+
+namespace v2rayN.Models
{
[Serializable]
internal class ServerTestItem
diff --git a/v2rayn/v2rayN/v2rayN/Models/SingboxConfig.cs b/v2rayn/v2rayN/v2rayN/Models/SingboxConfig.cs
index 45012e684d..da4675b933 100644
--- a/v2rayn/v2rayN/v2rayN/Models/SingboxConfig.cs
+++ b/v2rayn/v2rayN/v2rayN/Models/SingboxConfig.cs
@@ -241,6 +241,6 @@
public string? path { get; set; }
public string? url { get; set; }
public string? download_detour { get; set; }
- public string? update_interval { get; set; }
+ public string? update_interval { get; set; }
}
}
\ No newline at end of file
diff --git a/v2rayn/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs b/v2rayn/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
index bb191b4639..686f46a429 100644
--- a/v2rayn/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
+++ b/v2rayn/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
@@ -3,6 +3,7 @@ using ReactiveUI.Fody.Helpers;
using Splat;
using System.Reactive;
using System.Windows;
+using v2rayN.Enums;
using v2rayN.Handler;
using v2rayN.Models;
using v2rayN.Resx;
diff --git a/v2rayn/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs b/v2rayn/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
index d618c2d581..fcf5d6356e 100644
--- a/v2rayn/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
+++ b/v2rayn/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
@@ -3,6 +3,7 @@ using ReactiveUI.Fody.Helpers;
using Splat;
using System.Reactive;
using System.Windows;
+using v2rayN.Enums;
using v2rayN.Handler;
using v2rayN.Models;
using v2rayN.Resx;
diff --git a/v2rayn/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayn/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index f4417a14c2..0bdee0a475 100644
--- a/v2rayn/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayn/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -14,7 +14,9 @@ using System.Reactive.Linq;
using System.Text;
using System.Windows;
using System.Windows.Media;
+using v2rayN.Enums;
using v2rayN.Handler;
+using v2rayN.Handler.Fmt;
using v2rayN.Models;
using v2rayN.Resx;
using v2rayN.Views;
@@ -1152,7 +1154,7 @@ namespace v2rayN.ViewModels
_noticeHandler?.Enqueue(ResUI.PleaseSelectServer);
return;
}
- var url = ShareHandler.GetShareUrl(item);
+ var url = FmtHandler.GetShareUri(item);
if (Utils.IsNullOrEmpty(url))
{
return;
@@ -1293,7 +1295,7 @@ namespace v2rayN.ViewModels
StringBuilder sb = new();
foreach (var it in lstSelecteds)
{
- string url = ShareHandler.GetShareUrl(it);
+ string url = FmtHandler.GetShareUri(it);
if (Utils.IsNullOrEmpty(url))
{
continue;
@@ -1318,7 +1320,7 @@ namespace v2rayN.ViewModels
StringBuilder sb = new();
foreach (var it in lstSelecteds)
{
- string? url = ShareHandler.GetShareUrl(it);
+ string? url = FmtHandler.GetShareUri(it);
if (Utils.IsNullOrEmpty(url))
{
continue;
diff --git a/v2rayn/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayn/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
index e0987cdae2..77a4851d89 100644
--- a/v2rayn/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
+++ b/v2rayn/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -3,6 +3,7 @@ using ReactiveUI.Fody.Helpers;
using Splat;
using System.Reactive;
using System.Windows;
+using v2rayN.Enums;
using v2rayN.Handler;
using v2rayN.Models;
using v2rayN.Resx;
@@ -263,7 +264,7 @@ namespace v2rayN.ViewModels
var needReboot = (EnableStatistics != _config.guiItem.enableStatistics
|| EnableDragDropSort != _config.uiItem.enableDragDropSort
|| EnableHWA != _config.guiItem.enableHWA
- || CurrentFontFamily != _config.uiItem.currentFontFamily);
+ || CurrentFontFamily != _config.uiItem.currentFontFamily);
//if (Utile.IsNullOrEmpty(Kcpmtu.ToString()) || !Utile.IsNumeric(Kcpmtu.ToString())
// || Utile.IsNullOrEmpty(Kcptti.ToString()) || !Utile.IsNumeric(Kcptti.ToString())
diff --git a/v2rayn/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayn/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
index f6489450bd..2d5b532fca 100644
--- a/v2rayn/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayn/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
@@ -4,6 +4,7 @@ using ReactiveUI.Fody.Helpers;
using Splat;
using System.Reactive;
using System.Windows;
+using v2rayN.Enums;
using v2rayN.Handler;
using v2rayN.Models;
using v2rayN.Resx;
@@ -289,7 +290,7 @@ namespace v2rayN.ViewModels
private void ImportRulesFromClipboard()
{
- string clipboardData = Utils.GetClipboardData();
+ var clipboardData = Utils.GetClipboardData();
if (AddBatchRoutingRules(SelectedRouting, clipboardData) == 0)
{
RefreshRulesItems();
diff --git a/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
index 414cef744f..a02db935d9 100644
--- a/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
+++ b/v2rayn/v2rayN/v2rayN/Views/AddServer2Window.xaml.cs
@@ -1,6 +1,7 @@
using ReactiveUI;
using System.Reactive.Disposables;
using System.Windows;
+using v2rayN.Enums;
using v2rayN.Models;
using v2rayN.ViewModels;
diff --git a/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
index 0bbac569b0..17d43528b7 100644
--- a/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
+++ b/v2rayn/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs
@@ -2,6 +2,7 @@
using System.Reactive.Disposables;
using System.Windows;
using System.Windows.Controls;
+using v2rayN.Enums;
using v2rayN.Handler;
using v2rayN.Models;
using v2rayN.Resx;
diff --git a/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
index 513c504b7e..d05ae01376 100644
--- a/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
+++ b/v2rayn/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
@@ -2,6 +2,7 @@
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
+using v2rayN.Enums;
using v2rayN.Handler;
using v2rayN.Models;
using v2rayN.Resx;
diff --git a/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index b16972cb6d..bc37d8ff71 100644
--- a/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayn/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -10,6 +10,7 @@ using System.Windows.Input;
using System.Windows.Interop;
using System.Windows.Media;
using v2rayN.Base;
+using v2rayN.Enums;
using v2rayN.Handler;
using v2rayN.Models;
using v2rayN.Resx;
diff --git a/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
index 05761af072..53bdb32df8 100644
--- a/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
+++ b/v2rayn/v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
@@ -42,7 +42,7 @@ namespace v2rayN.Views
_config.inbound[0].destOverride?.ForEach(it =>
{
clbdestOverride.SelectedItems.Add(it);
- });
+ });
Global.IEProxyProtocols.ForEach(it =>
{
cmbsystemProxyAdvancedProtocol.Items.Add(it);
diff --git a/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs b/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
index 6e11e1db45..750288500f 100644
--- a/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
+++ b/v2rayn/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs
@@ -2,6 +2,7 @@
using System.Reactive.Disposables;
using System.Windows;
using System.Windows.Input;
+using v2rayN.Enums;
using v2rayN.Models;
using v2rayN.ViewModels;
diff --git a/v2rayn/v2rayN/v2rayN/v2rayN.csproj b/v2rayn/v2rayN/v2rayN/v2rayN.csproj
index 7c16b224aa..7b2ba3a90c 100644
--- a/v2rayn/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayn/v2rayN/v2rayN/v2rayN.csproj
@@ -24,7 +24,7 @@
-
+
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/AngConfig.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/AngConfig.kt
deleted file mode 100644
index 01f2bdd876..0000000000
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/AngConfig.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.v2ray.ang.dto
-
-data class AngConfig(
- var index: Int,
- var vmess: ArrayList,
- var subItem: ArrayList
-) {
- data class VmessBean(var guid: String = "123456",
- var address: String = "v2ray.cool",
- var port: Int = 10086,
- var id: String = "a3482e88-686a-4a58-8126-99c9df64b7bf",
- var alterId: Int = 64,
- var security: String = "aes-128-cfb",
- var network: String = "tcp",
- var remarks: String = "def",
- var headerType: String = "",
- var requestHost: String = "",
- var path: String = "",
- var streamSecurity: String = "",
- var allowInsecure: String = "",
- var configType: Int = 1,
- var configVersion: Int = 1,
- var testResult: String = "",
- var subid: String = "",
- var flow: String = "",
- var sni: String = "")
-
- data class SubItemBean(var id: String = "",
- var remarks: String = "",
- var url: String = "",
- var enabled: Boolean = true)
-}
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt
index 27000dbb32..fe5c79192e 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt
@@ -157,7 +157,7 @@ data class V2rayConfig(
var headers: HeadersBean = HeadersBean(),
val version: String? = null,
val method: String? = null) {
- data class HeadersBean(var Host: List = ArrayList(),
+ data class HeadersBean(var Host: List? = ArrayList(),
@SerializedName("User-Agent")
val userAgent: List? = null,
@SerializedName("Accept-Encoding")
@@ -247,7 +247,7 @@ data class V2rayConfig(
requestObj.headers.Host = (host ?: "").split(",").map { it.trim() }.filter { it.isNotEmpty() }
requestObj.path = (path ?: "").split(",").map { it.trim() }.filter { it.isNotEmpty() }
tcpSetting.header.request = requestObj
- sni = requestObj.headers.Host.getOrNull(0) ?: sni
+ sni = requestObj.headers.Host?.getOrNull(0) ?: sni
}
} else {
tcpSetting.header.type = "none"
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/SubscriptionUpdater.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/SubscriptionUpdater.kt
index 9cd6e1aeaa..2ba506b39d 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/SubscriptionUpdater.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/SubscriptionUpdater.kt
@@ -71,7 +71,7 @@ object SubscriptionUpdater {
val count = AngConfigManager.importBatchConfig(server, subid, append)
if (count <= 0) {
- AngConfigManager.importBatchConfig(Utils.decode(server!!), subid, append)
+ AngConfigManager.importBatchConfig(Utils.decode(server), subid, append)
}
if (count <= 0) {
AngConfigManager.appendCustomConfigServer(server, subid)
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt
index 3662b8bdf7..2ea7adf7d6 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt
@@ -162,7 +162,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter(R.id.listview) as ListView
- listview!!.adapter = adapter
+ listview?.adapter = adapter
init()
}
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
index b672b66798..b16ca78cfa 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt
@@ -39,8 +39,8 @@ object Utils {
* @param text
* @return
*/
- fun getEditable(text: String): Editable {
- return Editable.Factory.getInstance().newEditable(text)
+ fun getEditable(text: String?): Editable {
+ return Editable.Factory.getInstance().newEditable(text?:"")
}
/**
@@ -101,16 +101,16 @@ object Utils {
/**
* base64 decode
*/
- fun decode(text: String): String {
+ fun decode(text: String?): String {
tryDecodeBase64(text)?.let { return it }
- if (text.endsWith('=')) {
+ if (text?.endsWith('=')==true) {
// try again for some loosely formatted base64
tryDecodeBase64(text.trimEnd('='))?.let { return it }
}
return ""
}
- fun tryDecodeBase64(text: String): String? {
+ fun tryDecodeBase64(text: String?): String? {
try {
return Base64.decode(text, Base64.NO_WRAP).toString(charset("UTF-8"))
} catch (e: Exception) {
@@ -302,7 +302,11 @@ object Utils {
/**
* readTextFromAssets
*/
- fun readTextFromAssets(context: Context, fileName: String): String {
+ fun readTextFromAssets(context: Context?, fileName: String): String {
+ if(context == null)
+ {
+ return ""
+ }
val content = context.assets.open(fileName).bufferedReader().use {
it.readText()
}
@@ -389,7 +393,10 @@ object Utils {
}
}
- fun getIpv6Address(address: String): String {
+ fun getIpv6Address(address: String?): String {
+ if(address == null){
+ return ""
+ }
return if (isIpv6Address(address) && !address.contains('[') && !address.contains(']')) {
String.format("[%s]", address)
} else {
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
index f4ad2da5db..050e10e5c9 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
@@ -295,10 +295,10 @@ object V2rayConfigUtil {
rulesDomain.domain?.add(it)
}
}
- if (rulesDomain.domain?.size!! > 0) {
+ if ((rulesDomain.domain?.size ?: 0) > 0) {
v2rayConfig.routing.rules.add(rulesDomain)
}
- if (rulesIP.ip?.size!! > 0) {
+ if ((rulesIP.ip?.size ?: 0) > 0) {
v2rayConfig.routing.rules.add(rulesIP)
}
}
@@ -560,7 +560,7 @@ object V2rayConfigUtil {
} else {
path
}
- outbound.streamSettings?.tcpSettings?.header?.request?.headers?.Host = host!!
+ outbound.streamSettings?.tcpSettings?.header?.request?.headers?.Host = host
}
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/ShadowsocksFmt.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/ShadowsocksFmt.kt
index f79ccb0815..668264aafb 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/ShadowsocksFmt.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/ShadowsocksFmt.kt
@@ -58,7 +58,7 @@ object ShadowsocksFmt {
val url = String.format(
"%s@%s:%s",
pw,
- Utils.getIpv6Address(outbound.getServerAddress()!!),
+ Utils.getIpv6Address(outbound.getServerAddress()),
outbound.getServerPort()
)
return url + remark
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/SocksFmt.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/SocksFmt.kt
index 420f8a68f9..0148ec886e 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/SocksFmt.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/SocksFmt.kt
@@ -61,7 +61,7 @@ object SocksFmt {
val url = String.format(
"%s@%s:%s",
Utils.encode(pw),
- Utils.getIpv6Address(outbound.getServerAddress()!!),
+ Utils.getIpv6Address(outbound.getServerAddress()),
outbound.getServerPort()
)
return url + remark
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/TrojanFmt.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/TrojanFmt.kt
index b3365fcb62..0a42f8bd0c 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/TrojanFmt.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/TrojanFmt.kt
@@ -52,7 +52,7 @@ object TrojanFmt {
fingerprint = queryParam["fp"] ?: ""
config.outboundBean?.streamSettings?.populateTlsSettings(
queryParam["security"] ?: V2rayConfig.TLS,
- allowInsecure, queryParam["sni"] ?: sni!!, fingerprint, queryParam["alpn"],
+ allowInsecure, queryParam["sni"] ?: sni?:"", fingerprint, queryParam["alpn"],
null, null, null
)
flow = queryParam["flow"] ?: ""
@@ -92,16 +92,16 @@ object TrojanFmt {
Utils.removeWhiteSpace(tlsSetting.alpn.joinToString()).orEmpty()
}
if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
- dicQuery["fp"] = tlsSetting.fingerprint!!
+ dicQuery["fp"] = tlsSetting.fingerprint?:""
}
if (!TextUtils.isEmpty(tlsSetting.publicKey)) {
- dicQuery["pbk"] = tlsSetting.publicKey!!
+ dicQuery["pbk"] = tlsSetting.publicKey?:""
}
if (!TextUtils.isEmpty(tlsSetting.shortId)) {
- dicQuery["sid"] = tlsSetting.shortId!!
+ dicQuery["sid"] = tlsSetting.shortId?:""
}
if (!TextUtils.isEmpty(tlsSetting.spiderX)) {
- dicQuery["spx"] = Utils.urlEncode(tlsSetting.spiderX!!)
+ dicQuery["spx"] = Utils.urlEncode(tlsSetting.spiderX?:"")
}
}
dicQuery["type"] =
@@ -162,7 +162,7 @@ object TrojanFmt {
val url = String.format(
"%s@%s:%s",
outbound.getPassword(),
- Utils.getIpv6Address(outbound.getServerAddress()!!),
+ Utils.getIpv6Address(outbound.getServerAddress()),
outbound.getServerPort()
)
return url + query + remark
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VlessFmt.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VlessFmt.kt
index e689a31e83..6ab3003be9 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VlessFmt.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/VlessFmt.kt
@@ -92,16 +92,16 @@ object VlessFmt {
Utils.removeWhiteSpace(tlsSetting.alpn.joinToString()).orEmpty()
}
if (!TextUtils.isEmpty(tlsSetting.fingerprint)) {
- dicQuery["fp"] = tlsSetting.fingerprint!!
+ dicQuery["fp"] = tlsSetting.fingerprint?:""
}
if (!TextUtils.isEmpty(tlsSetting.publicKey)) {
- dicQuery["pbk"] = tlsSetting.publicKey!!
+ dicQuery["pbk"] = tlsSetting.publicKey?:""
}
if (!TextUtils.isEmpty(tlsSetting.shortId)) {
- dicQuery["sid"] = tlsSetting.shortId!!
+ dicQuery["sid"] = tlsSetting.shortId?:""
}
if (!TextUtils.isEmpty(tlsSetting.spiderX)) {
- dicQuery["spx"] = Utils.urlEncode(tlsSetting.spiderX!!)
+ dicQuery["spx"] = Utils.urlEncode(tlsSetting.spiderX?:"")
}
}
dicQuery["type"] =
@@ -162,7 +162,7 @@ object VlessFmt {
val url = String.format(
"%s@%s:%s",
outbound.getPassword(),
- Utils.getIpv6Address(outbound.getServerAddress()!!),
+ Utils.getIpv6Address(outbound.getServerAddress()),
outbound.getServerPort()
)
return url + query + remark
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt
index 90c1ebe9ee..d00a4d75bf 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/fmt/WireguardFmt.kt
@@ -63,7 +63,7 @@ object WireguardFmt {
val url = String.format(
"%s@%s:%s",
Utils.urlEncode(outbound.getPassword().toString()),
- Utils.getIpv6Address(outbound.getServerAddress()!!),
+ Utils.getIpv6Address(outbound.getServerAddress()),
outbound.getServerPort()
)
return url + query + remark
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt
index 08e4b5eac1..7e0510c8ac 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt
@@ -60,8 +60,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
}
var serverList = MmkvManager.decodeServerList()
- var subscriptionId: String = settingsStorage.decodeString(AppConfig.CACHE_SUBSCRIPTION_ID, "")!!
- var keywordFilter: String = settingsStorage.decodeString(AppConfig.CACHE_KEYWORD_FILTER, "")!!
+ var subscriptionId: String = settingsStorage.decodeString(AppConfig.CACHE_SUBSCRIPTION_ID, "")?:""
+ var keywordFilter: String = settingsStorage.decodeString(AppConfig.CACHE_KEYWORD_FILTER, "")?:""
private set
val serversCache = mutableListOf()
val isRunning by lazy { MutableLiveData() }
diff --git a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/SubViewModel.kt b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/SubViewModel.kt
index b2f5cd42d8..67ad1ee3cd 100644
--- a/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/SubViewModel.kt
+++ b/v2rayng/V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/SubViewModel.kt
@@ -83,7 +83,7 @@ class SubViewModel(application: Application) : AndroidViewModel(application) {
fun importBatchConfig(server: String?, subid: String = "", append: Boolean): Int {
var count = AngConfigManager.importBatchConfig(server, subid, append)
if (count <= 0) {
- count = AngConfigManager.importBatchConfig(Utils.decode(server!!), subid, append)
+ count = AngConfigManager.importBatchConfig(Utils.decode(server), subid, append)
}
if (count <= 0) {
count = AngConfigManager.appendCustomConfigServer(server, subid)
diff --git a/v2rayng/V2rayNG/app/src/main/res/layout/activity_about.xml b/v2rayng/V2rayNG/app/src/main/res/layout/activity_about.xml
index adb1602e2c..9818c3a45e 100644
--- a/v2rayng/V2rayNG/app/src/main/res/layout/activity_about.xml
+++ b/v2rayng/V2rayNG/app/src/main/res/layout/activity_about.xml
@@ -1,226 +1,230 @@
-
+ android:layout_height="match_parent">
-
-
-
+ android:gravity="top"
+ android:orientation="vertical">
+ android:clickable="true"
+ android:focusable="true"
+ android:foreground="?attr/selectableItemBackground"
+ android:gravity="center|start"
+ android:orientation="horizontal"
+ android:padding="16dp">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:paddingStart="16dp"
+ android:text="@string/title_configuration_restore"
+ android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/xray-core/go.mod b/xray-core/go.mod
index c3c4f8bd39..abd2226ac6 100644
--- a/xray-core/go.mod
+++ b/xray-core/go.mod
@@ -14,7 +14,7 @@ require (
github.com/pires/go-proxyproto v0.7.0
github.com/quic-go/quic-go v0.44.0
github.com/refraction-networking/utls v1.6.6
- github.com/sagernet/sing v0.3.8
+ github.com/sagernet/sing v0.4.0
github.com/sagernet/sing-shadowsocks v0.2.6
github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb
github.com/stretchr/testify v1.9.0
@@ -22,10 +22,10 @@ require (
github.com/vishvananda/netlink v1.2.1-beta.2.0.20230316163032-ced5aaba43e3
github.com/xtls/reality v0.0.0-20240429224917-ecc4401070cc
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
- golang.org/x/crypto v0.23.0
- golang.org/x/net v0.25.0
+ golang.org/x/crypto v0.24.0
+ golang.org/x/net v0.26.0
golang.org/x/sync v0.7.0
- golang.org/x/sys v0.20.0
+ golang.org/x/sys v0.21.0
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173
google.golang.org/grpc v1.64.0
google.golang.org/protobuf v1.34.1
@@ -39,23 +39,23 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
- github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+ github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/btree v1.1.2 // indirect
- github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
- github.com/klauspost/compress v1.17.7 // indirect
+ github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // indirect
+ github.com/klauspost/compress v1.17.8 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
- github.com/onsi/ginkgo/v2 v2.16.0 // indirect
+ github.com/onsi/ginkgo/v2 v2.19.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
go.uber.org/mock v0.4.0 // indirect
- golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
+ golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect
golang.org/x/mod v0.17.0 // indirect
- golang.org/x/text v0.15.0 // indirect
+ golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
- golang.org/x/tools v0.21.0 // indirect
+ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/xray-core/go.sum b/xray-core/go.sum
index f961a90fac..004795369f 100644
--- a/xray-core/go.sum
+++ b/xray-core/go.sum
@@ -38,8 +38,8 @@ github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aev
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
@@ -49,8 +49,6 @@ github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/
github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
-github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
@@ -61,8 +59,8 @@ github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+u
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 h1:y3N7Bm7Y9/CtpiVkw/ZWj6lSlDF3F74SfKwfTCer72Q=
-github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
+github.com/google/pprof v0.0.0-20240528025155-186aa0362fba h1:ql1qNgCyOB7iAEk8JTNM+zJrgIbnyCKX/wdlyPufP5g=
+github.com/google/pprof v0.0.0-20240528025155-186aa0362fba/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -76,8 +74,8 @@ github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
+github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -96,10 +94,10 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
-github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
-github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
-github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
-github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
+github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=
+github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
+github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
+github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
@@ -121,8 +119,8 @@ github.com/refraction-networking/utls v1.6.6/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5D
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/sagernet/sing v0.3.8 h1:gm4JKalPhydMYX2zFOTnnd4TXtM/16WFRqSjMepYQQk=
-github.com/sagernet/sing v0.3.8/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
+github.com/sagernet/sing v0.4.0 h1:sCLSqLHOptgFvzQO9FfaYMl4PONePZkclMznpeKhdHc=
+github.com/sagernet/sing v0.4.0/go.mod h1:Xh4KO9nGdvm4K/LVg9Xn9jSxJdqe9KcXbAzNC1S2qfw=
github.com/sagernet/sing-shadowsocks v0.2.6 h1:xr7ylAS/q1cQYS8oxKKajhuQcchd5VJJ4K4UZrrpp0s=
github.com/sagernet/sing-shadowsocks v0.2.6/go.mod h1:j2YZBIpWIuElPFL/5sJAj470bcn/3QQ5lxZUNKLDNAM=
github.com/seiflotfy/cuckoofilter v0.0.0-20220411075957-e3b120b3f5fb h1:XfLJSPIOUX+osiMraVgIrMR27uMXnRJWGm1+GL8/63U=
@@ -181,11 +179,11 @@ golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnf
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM=
-golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
+golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc h1:O9NuF4s+E/PvMIy+9IUZB9znFwUIXEWSstNjek6VpVg=
+golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -203,8 +201,8 @@ golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -230,15 +228,15 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
@@ -250,8 +248,8 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
-golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw=
-golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -271,8 +269,8 @@ google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoA
google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
diff --git a/xray-core/infra/conf/transport_internet.go b/xray-core/infra/conf/transport_internet.go
index 908a95d3ef..3ebb532667 100644
--- a/xray-core/infra/conf/transport_internet.go
+++ b/xray-core/infra/conf/transport_internet.go
@@ -208,8 +208,10 @@ func (c *HttpUpgradeConfig) Build() (proto.Message, error) {
// Host priority: Host field > headers field > address.
if c.Host == "" && c.Headers["host"] != "" {
c.Host = c.Headers["host"]
+ delete(c.Headers,"host")
} else if c.Host == "" && c.Headers["Host"] != "" {
c.Host = c.Headers["Host"]
+ delete(c.Headers,"Host")
}
config := &httpupgrade.Config{
Path: path,
diff --git a/xray-core/infra/conf/wireguard.go b/xray-core/infra/conf/wireguard.go
index a4f0eda6e2..adf5184196 100644
--- a/xray-core/infra/conf/wireguard.go
+++ b/xray-core/infra/conf/wireguard.go
@@ -22,14 +22,14 @@ func (c *WireGuardPeerConfig) Build() (proto.Message, error) {
config := new(wireguard.PeerConfig)
if c.PublicKey != "" {
- config.PublicKey, err = parseWireGuardKey(c.PublicKey)
+ config.PublicKey, err = ParseWireGuardKey(c.PublicKey)
if err != nil {
return nil, err
}
}
if c.PreSharedKey != "" {
- config.PreSharedKey, err = parseWireGuardKey(c.PreSharedKey)
+ config.PreSharedKey, err = ParseWireGuardKey(c.PreSharedKey)
if err != nil {
return nil, err
}
@@ -64,7 +64,7 @@ func (c *WireGuardConfig) Build() (proto.Message, error) {
config := new(wireguard.DeviceConfig)
var err error
- config.SecretKey, err = parseWireGuardKey(c.SecretKey)
+ config.SecretKey, err = ParseWireGuardKey(c.SecretKey)
if err != nil {
return nil, err
}
@@ -132,7 +132,7 @@ func (c *WireGuardConfig) Build() (proto.Message, error) {
return config, nil
}
-func parseWireGuardKey(str string) (string, error) {
+func ParseWireGuardKey(str string) (string, error) {
var err error
if len(str)%2 == 0 {
diff --git a/xray-core/proxy/wireguard/tun_linux.go b/xray-core/proxy/wireguard/tun_linux.go
index b85a9d097e..5ec40ffe83 100644
--- a/xray-core/proxy/wireguard/tun_linux.go
+++ b/xray-core/proxy/wireguard/tun_linux.go
@@ -29,7 +29,7 @@ type deviceNet struct {
func newDeviceNet(interfaceName string) *deviceNet {
var dialer net.Dialer
- bindControl := control.BindToInterface(control.DefaultInterfaceFinder(), interfaceName, -1)
+ bindControl := control.BindToInterface(control.NewDefaultInterfaceFinder(), interfaceName, -1)
dialer.Control = control.Append(dialer.Control, bindControl)
return &deviceNet{dialer: dialer}
}
diff --git a/xray-core/testing/scenarios/wireguard_test.go b/xray-core/testing/scenarios/wireguard_test.go
new file mode 100644
index 0000000000..6b16ca166b
--- /dev/null
+++ b/xray-core/testing/scenarios/wireguard_test.go
@@ -0,0 +1,124 @@
+package scenarios
+
+import (
+ "testing"
+ //"time"
+
+ "github.com/xtls/xray-core/app/log"
+ "github.com/xtls/xray-core/app/proxyman"
+ "github.com/xtls/xray-core/common"
+ clog "github.com/xtls/xray-core/common/log"
+ "github.com/xtls/xray-core/common/net"
+ "github.com/xtls/xray-core/common/serial"
+ core "github.com/xtls/xray-core/core"
+ "github.com/xtls/xray-core/infra/conf"
+ "github.com/xtls/xray-core/proxy/dokodemo"
+ "github.com/xtls/xray-core/proxy/freedom"
+ "github.com/xtls/xray-core/proxy/wireguard"
+ "github.com/xtls/xray-core/testing/servers/tcp"
+ "github.com/xtls/xray-core/testing/servers/udp"
+ //"golang.org/x/sync/errgroup"
+)
+
+func TestWireguard(t *testing.T) {
+ tcpServer := tcp.Server{
+ MsgProcessor: xor,
+ }
+ dest, err := tcpServer.Start()
+ common.Must(err)
+ defer tcpServer.Close()
+
+ serverPrivate, _ := conf.ParseWireGuardKey("EGs4lTSJPmgELx6YiJAmPR2meWi6bY+e9rTdCipSj10=")
+ serverPublic, _ := conf.ParseWireGuardKey("osAMIyil18HeZXGGBDC9KpZoM+L2iGyXWVSYivuM9B0=")
+ clientPrivate, _ := conf.ParseWireGuardKey("CPQSpgxgdQRZa5SUbT3HLv+mmDVHLW5YR/rQlzum/2I=")
+ clientPublic, _ := conf.ParseWireGuardKey("MmLJ5iHFVVBp7VsB0hxfpQ0wEzAbT2KQnpQpj0+RtBw=")
+
+ serverPort := udp.PickPort()
+ serverConfig := &core.Config{
+ App: []*serial.TypedMessage{
+ serial.ToTypedMessage(&log.Config{
+ ErrorLogLevel: clog.Severity_Debug,
+ ErrorLogType: log.LogType_Console,
+ }),
+ },
+ Inbound: []*core.InboundHandlerConfig{
+ {
+ ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{
+ PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(serverPort)}},
+ Listen: net.NewIPOrDomain(net.LocalHostIP),
+ }),
+ ProxySettings: serial.ToTypedMessage(&wireguard.DeviceConfig{
+ IsClient: false,
+ KernelMode: false,
+ Endpoint: []string{"10.0.0.1"},
+ Mtu: 1420,
+ SecretKey: serverPrivate,
+ Peers: []*wireguard.PeerConfig{{
+ PublicKey: serverPublic,
+ AllowedIps: []string{"0.0.0.0/0", "::0/0"},
+ }},
+ }),
+ },
+ },
+ Outbound: []*core.OutboundHandlerConfig{
+ {
+ ProxySettings: serial.ToTypedMessage(&freedom.Config{}),
+ },
+ },
+ }
+
+ clientPort := tcp.PickPort()
+ clientConfig := &core.Config{
+ App: []*serial.TypedMessage{
+ serial.ToTypedMessage(&log.Config{
+ ErrorLogLevel: clog.Severity_Debug,
+ ErrorLogType: log.LogType_Console,
+ }),
+ },
+ Inbound: []*core.InboundHandlerConfig{
+ {
+ ReceiverSettings: serial.ToTypedMessage(&proxyman.ReceiverConfig{
+ PortList: &net.PortList{Range: []*net.PortRange{net.SinglePortRange(clientPort)}},
+ Listen: net.NewIPOrDomain(net.LocalHostIP),
+ }),
+ ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
+ Address: net.NewIPOrDomain(dest.Address),
+ Port: uint32(dest.Port),
+ NetworkList: &net.NetworkList{
+ Network: []net.Network{net.Network_TCP},
+ },
+ }),
+ },
+ },
+ Outbound: []*core.OutboundHandlerConfig{
+ {
+ ProxySettings: serial.ToTypedMessage(&wireguard.DeviceConfig{
+ IsClient: true,
+ KernelMode: false,
+ Endpoint: []string{"10.0.0.2"},
+ Mtu: 1420,
+ SecretKey: clientPrivate,
+ Peers: []*wireguard.PeerConfig{{
+ Endpoint: "127.0.0.1:" + serverPort.String(),
+ PublicKey: clientPublic,
+ AllowedIps: []string{"0.0.0.0/0", "::0/0"},
+ }},
+ }),
+ },
+ },
+ }
+
+ servers, err := InitializeServerConfigs(serverConfig, clientConfig)
+ common.Must(err)
+ defer CloseAllServers(servers)
+
+ // FIXME: for some reason wg server does not receive
+
+ // var errg errgroup.Group
+ // for i := 0; i < 1; i++ {
+ // errg.Go(testTCPConn(clientPort, 1024, time.Second*2))
+ // }
+ // if err := errg.Wait(); err != nil {
+ // t.Error(err)
+ // }
+}
\ No newline at end of file
diff --git a/xray-core/transport/internet/httpupgrade/dialer.go b/xray-core/transport/internet/httpupgrade/dialer.go
index b54af9a6a8..f1be7c4ef8 100644
--- a/xray-core/transport/internet/httpupgrade/dialer.go
+++ b/xray-core/transport/internet/httpupgrade/dialer.go
@@ -24,8 +24,10 @@ type ConnRF struct {
func (c *ConnRF) Read(b []byte) (int, error) {
if c.First {
c.First = false
- // TODO The bufio usage here is unreliable
- resp, err := http.ReadResponse(bufio.NewReader(c.Conn), c.Req) // nolint:bodyclose
+ // create reader capped to size of `b`, so it can be fully drained into
+ // `b` later with a single Read call
+ reader := bufio.NewReaderSize(c.Conn, len(b))
+ resp, err := http.ReadResponse(reader, c.Req) // nolint:bodyclose
if err != nil {
return 0, err
}
@@ -34,6 +36,8 @@ func (c *ConnRF) Read(b []byte) (int, error) {
strings.ToLower(resp.Header.Get("Connection")) != "upgrade" {
return 0, newError("unrecognized reply")
}
+ // drain remaining bufreader
+ return reader.Read(b[:reader.Buffered()])
}
return c.Conn.Read(b)
}
@@ -74,7 +78,7 @@ func dialhttpUpgrade(ctx context.Context, dest net.Destination, streamSettings *
Header: make(http.Header),
}
for key, value := range transportConfiguration.Header {
- req.Header.Add(key, value)
+ AddHeader(req.Header, key, value)
}
req.Header.Set("Connection", "upgrade")
req.Header.Set("Upgrade", "websocket")
@@ -100,7 +104,14 @@ func dialhttpUpgrade(ctx context.Context, dest net.Destination, streamSettings *
return connRF, nil
}
-func dial(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (stat.Connection, error) {
+//http.Header.Add() will convert headers to MIME header format.
+//Some people don't like this because they want to send "Web*S*ocket".
+//So we add a simple function to replace that method.
+func AddHeader(header http.Header, key, value string) {
+ header[key] = append(header[key], value)
+}
+
+func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.MemoryStreamConfig) (stat.Connection, error) {
newError("creating connection to ", dest).WriteToLog(session.ExportIDToError(ctx))
conn, err := dialhttpUpgrade(ctx, dest, streamSettings)
@@ -111,5 +122,5 @@ func dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
}
func init() {
- common.Must(internet.RegisterTransportDialer(protocolName, dial))
+ common.Must(internet.RegisterTransportDialer(protocolName, Dial))
}
diff --git a/xray-core/transport/internet/httpupgrade/httpupgrade_test.go b/xray-core/transport/internet/httpupgrade/httpupgrade_test.go
new file mode 100644
index 0000000000..991c37cb99
--- /dev/null
+++ b/xray-core/transport/internet/httpupgrade/httpupgrade_test.go
@@ -0,0 +1,212 @@
+package httpupgrade_test
+
+import (
+ "context"
+ "runtime"
+ "testing"
+ "time"
+
+ "github.com/xtls/xray-core/common"
+ "github.com/xtls/xray-core/common/net"
+ "github.com/xtls/xray-core/common/protocol/tls/cert"
+ "github.com/xtls/xray-core/testing/servers/tcp"
+ "github.com/xtls/xray-core/transport/internet"
+ . "github.com/xtls/xray-core/transport/internet/httpupgrade"
+ "github.com/xtls/xray-core/transport/internet/stat"
+ "github.com/xtls/xray-core/transport/internet/tls"
+)
+
+func Test_listenHTTPUpgradeAndDial(t *testing.T) {
+ listenPort := tcp.PickPort()
+ listen, err := ListenHTTPUpgrade(context.Background(), net.LocalHostIP, listenPort, &internet.MemoryStreamConfig{
+ ProtocolName: "httpupgrade",
+ ProtocolSettings: &Config{
+ Path: "httpupgrade",
+ },
+ }, func(conn stat.Connection) {
+ go func(c stat.Connection) {
+ defer c.Close()
+
+ var b [1024]byte
+ _, err := c.Read(b[:])
+ if err != nil {
+ return
+ }
+
+ common.Must2(c.Write([]byte("Response")))
+ }(conn)
+ })
+ common.Must(err)
+
+ ctx := context.Background()
+ streamSettings := &internet.MemoryStreamConfig{
+ ProtocolName: "httpupgrade",
+ ProtocolSettings: &Config{Path: "httpupgrade"},
+ }
+ conn, err := Dial(ctx, net.TCPDestination(net.DomainAddress("localhost"), listenPort), streamSettings)
+
+ common.Must(err)
+ _, err = conn.Write([]byte("Test connection 1"))
+ common.Must(err)
+
+ var b [1024]byte
+ n, err := conn.Read(b[:])
+ common.Must(err)
+ if string(b[:n]) != "Response" {
+ t.Error("response: ", string(b[:n]))
+ }
+
+ common.Must(conn.Close())
+ <-time.After(time.Second * 5)
+ conn, err = Dial(ctx, net.TCPDestination(net.DomainAddress("localhost"), listenPort), streamSettings)
+ common.Must(err)
+ _, err = conn.Write([]byte("Test connection 2"))
+ common.Must(err)
+ n, err = conn.Read(b[:])
+ common.Must(err)
+ if string(b[:n]) != "Response" {
+ t.Error("response: ", string(b[:n]))
+ }
+ common.Must(conn.Close())
+
+ common.Must(listen.Close())
+}
+
+func Test_listenHTTPUpgradeAndDialWithHeaders(t *testing.T) {
+ listenPort := tcp.PickPort()
+ listen, err := ListenHTTPUpgrade(context.Background(), net.LocalHostIP, listenPort, &internet.MemoryStreamConfig{
+ ProtocolName: "httpupgrade",
+ ProtocolSettings: &Config{
+ Path: "httpupgrade",
+ Header: map[string]string{
+ "User-Agent": "Mozilla",
+ },
+ },
+ }, func(conn stat.Connection) {
+ go func(c stat.Connection) {
+ defer c.Close()
+
+ var b [1024]byte
+ _, err := c.Read(b[:])
+ if err != nil {
+ return
+ }
+
+ common.Must2(c.Write([]byte("Response")))
+ }(conn)
+ })
+ common.Must(err)
+
+ ctx := context.Background()
+ streamSettings := &internet.MemoryStreamConfig{
+ ProtocolName: "httpupgrade",
+ ProtocolSettings: &Config{Path: "httpupgrade"},
+ }
+ conn, err := Dial(ctx, net.TCPDestination(net.DomainAddress("localhost"), listenPort), streamSettings)
+
+ common.Must(err)
+ _, err = conn.Write([]byte("Test connection 1"))
+ common.Must(err)
+
+ var b [1024]byte
+ n, err := conn.Read(b[:])
+ common.Must(err)
+ if string(b[:n]) != "Response" {
+ t.Error("response: ", string(b[:n]))
+ }
+
+ common.Must(conn.Close())
+ <-time.After(time.Second * 5)
+ conn, err = Dial(ctx, net.TCPDestination(net.DomainAddress("localhost"), listenPort), streamSettings)
+ common.Must(err)
+ _, err = conn.Write([]byte("Test connection 2"))
+ common.Must(err)
+ n, err = conn.Read(b[:])
+ common.Must(err)
+ if string(b[:n]) != "Response" {
+ t.Error("response: ", string(b[:n]))
+ }
+ common.Must(conn.Close())
+
+ common.Must(listen.Close())
+}
+
+func TestDialWithRemoteAddr(t *testing.T) {
+ listenPort := tcp.PickPort()
+ listen, err := ListenHTTPUpgrade(context.Background(), net.LocalHostIP, listenPort, &internet.MemoryStreamConfig{
+ ProtocolName: "httpupgrade",
+ ProtocolSettings: &Config{
+ Path: "httpupgrade",
+ },
+ }, func(conn stat.Connection) {
+ go func(c stat.Connection) {
+ defer c.Close()
+
+ var b [1024]byte
+ _, err := c.Read(b[:])
+ // common.Must(err)
+ if err != nil {
+ return
+ }
+
+ _, err = c.Write([]byte("Response"))
+ common.Must(err)
+ }(conn)
+ })
+ common.Must(err)
+
+ conn, err := Dial(context.Background(), net.TCPDestination(net.DomainAddress("localhost"), listenPort), &internet.MemoryStreamConfig{
+ ProtocolName: "httpupgrade",
+ ProtocolSettings: &Config{Path: "httpupgrade", Header: map[string]string{"X-Forwarded-For": "1.1.1.1"}},
+ })
+
+ common.Must(err)
+ _, err = conn.Write([]byte("Test connection 1"))
+ common.Must(err)
+
+ var b [1024]byte
+ n, err := conn.Read(b[:])
+ common.Must(err)
+ if string(b[:n]) != "Response" {
+ t.Error("response: ", string(b[:n]))
+ }
+
+ common.Must(listen.Close())
+}
+
+func Test_listenHTTPUpgradeAndDial_TLS(t *testing.T) {
+ listenPort := tcp.PickPort()
+ if runtime.GOARCH == "arm64" {
+ return
+ }
+
+ start := time.Now()
+
+ streamSettings := &internet.MemoryStreamConfig{
+ ProtocolName: "httpupgrade",
+ ProtocolSettings: &Config{
+ Path: "httpupgrades",
+ },
+ SecurityType: "tls",
+ SecuritySettings: &tls.Config{
+ AllowInsecure: true,
+ Certificate: []*tls.Certificate{tls.ParseCertificate(cert.MustGenerate(nil, cert.CommonName("localhost")))},
+ },
+ }
+ listen, err := ListenHTTPUpgrade(context.Background(), net.LocalHostIP, listenPort, streamSettings, func(conn stat.Connection) {
+ go func() {
+ _ = conn.Close()
+ }()
+ })
+ common.Must(err)
+ defer listen.Close()
+
+ conn, err := Dial(context.Background(), net.TCPDestination(net.DomainAddress("localhost"), listenPort), streamSettings)
+ common.Must(err)
+ _ = conn.Close()
+
+ end := time.Now()
+ if !end.Before(start.Add(time.Second * 5)) {
+ t.Error("end: ", end, " start: ", start)
+ }
+}
diff --git a/xray-core/transport/internet/httpupgrade/hub.go b/xray-core/transport/internet/httpupgrade/hub.go
index f78f844284..5c3ccbd360 100644
--- a/xray-core/transport/internet/httpupgrade/hub.go
+++ b/xray-core/transport/internet/httpupgrade/hub.go
@@ -78,12 +78,8 @@ func (s *server) Handle(conn net.Conn) (stat.Connection, error) {
Port: int(0),
}
}
- if remoteAddr == nil {
- return nil, newError("remoteAddr is nil")
- }
- conn = newConnection(conn, remoteAddr)
- return stat.Connection(conn), nil
+ return stat.Connection(newConnection(conn, remoteAddr)), nil
}
func (s *server) keepAccepting() {
@@ -101,7 +97,7 @@ func (s *server) keepAccepting() {
}
}
-func listenHTTPUpgrade(ctx context.Context, address net.Address, port net.Port, streamSettings *internet.MemoryStreamConfig, addConn internet.ConnHandler) (internet.Listener, error) {
+func ListenHTTPUpgrade(ctx context.Context, address net.Address, port net.Port, streamSettings *internet.MemoryStreamConfig, addConn internet.ConnHandler) (internet.Listener, error) {
transportConfiguration := streamSettings.ProtocolSettings.(*Config)
if transportConfiguration != nil {
if streamSettings.SocketSettings == nil {
@@ -151,5 +147,5 @@ func listenHTTPUpgrade(ctx context.Context, address net.Address, port net.Port,
}
func init() {
- common.Must(internet.RegisterTransportListener(protocolName, listenHTTPUpgrade))
+ common.Must(internet.RegisterTransportListener(protocolName, ListenHTTPUpgrade))
}
diff --git a/xray-core/transport/internet/websocket/ws_test.go b/xray-core/transport/internet/websocket/ws_test.go
index 12223353f7..48892ead97 100644
--- a/xray-core/transport/internet/websocket/ws_test.go
+++ b/xray-core/transport/internet/websocket/ws_test.go
@@ -9,6 +9,7 @@ import (
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/net"
"github.com/xtls/xray-core/common/protocol/tls/cert"
+ "github.com/xtls/xray-core/testing/servers/tcp"
"github.com/xtls/xray-core/transport/internet"
"github.com/xtls/xray-core/transport/internet/stat"
"github.com/xtls/xray-core/transport/internet/tls"
@@ -16,7 +17,8 @@ import (
)
func Test_listenWSAndDial(t *testing.T) {
- listen, err := ListenWS(context.Background(), net.LocalHostIP, 13146, &internet.MemoryStreamConfig{
+ listenPort := tcp.PickPort()
+ listen, err := ListenWS(context.Background(), net.LocalHostIP, listenPort, &internet.MemoryStreamConfig{
ProtocolName: "websocket",
ProtocolSettings: &Config{
Path: "ws",
@@ -41,7 +43,7 @@ func Test_listenWSAndDial(t *testing.T) {
ProtocolName: "websocket",
ProtocolSettings: &Config{Path: "ws"},
}
- conn, err := Dial(ctx, net.TCPDestination(net.DomainAddress("localhost"), 13146), streamSettings)
+ conn, err := Dial(ctx, net.TCPDestination(net.DomainAddress("localhost"), listenPort), streamSettings)
common.Must(err)
_, err = conn.Write([]byte("Test connection 1"))
@@ -56,7 +58,7 @@ func Test_listenWSAndDial(t *testing.T) {
common.Must(conn.Close())
<-time.After(time.Second * 5)
- conn, err = Dial(ctx, net.TCPDestination(net.DomainAddress("localhost"), 13146), streamSettings)
+ conn, err = Dial(ctx, net.TCPDestination(net.DomainAddress("localhost"), listenPort), streamSettings)
common.Must(err)
_, err = conn.Write([]byte("Test connection 2"))
common.Must(err)
@@ -71,7 +73,8 @@ func Test_listenWSAndDial(t *testing.T) {
}
func TestDialWithRemoteAddr(t *testing.T) {
- listen, err := ListenWS(context.Background(), net.LocalHostIP, 13148, &internet.MemoryStreamConfig{
+ listenPort := tcp.PickPort()
+ listen, err := ListenWS(context.Background(), net.LocalHostIP, listenPort, &internet.MemoryStreamConfig{
ProtocolName: "websocket",
ProtocolSettings: &Config{
Path: "ws",
@@ -93,7 +96,7 @@ func TestDialWithRemoteAddr(t *testing.T) {
})
common.Must(err)
- conn, err := Dial(context.Background(), net.TCPDestination(net.DomainAddress("localhost"), 13148), &internet.MemoryStreamConfig{
+ conn, err := Dial(context.Background(), net.TCPDestination(net.DomainAddress("localhost"), listenPort), &internet.MemoryStreamConfig{
ProtocolName: "websocket",
ProtocolSettings: &Config{Path: "ws", Header: map[string]string{"X-Forwarded-For": "1.1.1.1"}},
})
@@ -113,6 +116,7 @@ func TestDialWithRemoteAddr(t *testing.T) {
}
func Test_listenWSAndDial_TLS(t *testing.T) {
+ listenPort := tcp.PickPort()
if runtime.GOARCH == "arm64" {
return
}
@@ -130,7 +134,7 @@ func Test_listenWSAndDial_TLS(t *testing.T) {
Certificate: []*tls.Certificate{tls.ParseCertificate(cert.MustGenerate(nil, cert.CommonName("localhost")))},
},
}
- listen, err := ListenWS(context.Background(), net.LocalHostIP, 13143, streamSettings, func(conn stat.Connection) {
+ listen, err := ListenWS(context.Background(), net.LocalHostIP, listenPort, streamSettings, func(conn stat.Connection) {
go func() {
_ = conn.Close()
}()
@@ -138,7 +142,7 @@ func Test_listenWSAndDial_TLS(t *testing.T) {
common.Must(err)
defer listen.Close()
- conn, err := Dial(context.Background(), net.TCPDestination(net.DomainAddress("localhost"), 13143), streamSettings)
+ conn, err := Dial(context.Background(), net.TCPDestination(net.DomainAddress("localhost"), listenPort), streamSettings)
common.Must(err)
_ = conn.Close()
diff --git a/yass/.circleci/config.yml b/yass/.circleci/config.yml
index c50a34a215..a87db997e9 100644
--- a/yass/.circleci/config.yml
+++ b/yass/.circleci/config.yml
@@ -41,7 +41,7 @@ commands:
sudo apt-get update -qq
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y clang
- install-deps:
+ install-deps-gtk3:
steps:
- run:
command: |
@@ -52,6 +52,17 @@ commands:
cmake --version
rm -f *.tar.gz
+ install-deps-qt6:
+ steps:
+ - run:
+ command: |
+ sudo apt-get update -qq
+ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y cmake ninja-build qt6-base-dev qt6-tools-dev qt6-tools-dev-tools libglx-dev libgl1-mesa-dev qt6-l10n-tools libncurses5 gettext libcurl4-openssl-dev dpkg-dev
+ curl -L -O https://github.com/Kitware/CMake/releases/download/v3.28.5/cmake-3.28.5-linux-x86_64.tar.gz
+ sudo tar -C /usr/local --strip-components=1 -xf cmake-3.28.5-linux-x86_64.tar.gz
+ cmake --version
+ rm -f *.tar.gz
+
install-deps-golang:
steps:
- run:
@@ -81,6 +92,16 @@ commands:
cd build
cmake -G Ninja -DGUI=on -DBUILD_TESTS=on -DBORINGSSL_BUILD_TESTS=on -DCMAKE_BUILD_TYPE=Release -DUSE_TCMALLOC=on ..
+ configure-qt6:
+ steps:
+ - run:
+ command: |
+ export "CC=$PWD/third_party/clang+llvm-17.0.6-x86_64-linux-gnu-ubuntu-22.04/bin/clang"
+ export "CXX=$PWD/third_party/clang+llvm-17.0.6-x86_64-linux-gnu-ubuntu-22.04/bin/clang++"
+ mkdir build
+ cd build
+ cmake -G Ninja -DGUI=on -DUSE_QT6=on -DBUILD_TESTS=on -DBORINGSSL_BUILD_TESTS=on -DCMAKE_BUILD_TYPE=Release -DUSE_TCMALLOC=on ..
+
configure-gcc:
steps:
- run:
@@ -192,19 +213,31 @@ jobs:
steps:
- checkout
- update-submodule
- - install-deps
+ - install-deps-gtk3
- install-deps-golang
- download-toolchain-clang
- configure
- build
- test
+ basic-qt6:
+ executor: ubuntu
+ steps:
+ - checkout
+ - update-submodule
+ - install-deps-qt6
+ - install-deps-golang
+ - download-toolchain-clang
+ - configure-qt6
+ - build
+ - test
+
basic-gcc:
executor: ubuntu
steps:
- checkout
- update-submodule
- - install-deps
+ - install-deps-gtk3
- install-deps-golang
- download-toolchain-gcc
- configure-gcc
@@ -216,7 +249,7 @@ jobs:
steps:
- checkout
- update-submodule
- - install-deps
+ - install-deps-gtk3
- install-deps-golang
- download-toolchain-clang
- configure-without-libcxx
@@ -230,7 +263,7 @@ jobs:
steps:
- checkout
- update-submodule
- - install-deps
+ - install-deps-gtk3
- install-deps-golang
- download-toolchain-arm
- configure-arm
@@ -242,7 +275,7 @@ jobs:
steps:
- checkout
- update-submodule
- - install-deps
+ - install-deps-gtk3
- install-deps-golang
- download-toolchain
- configure-asan
@@ -254,7 +287,7 @@ jobs:
steps:
- checkout
- update-submodule
- - install-deps
+ - install-deps-gtk3
- install-deps-golang
- download-toolchain
- configure-ubsan
@@ -266,7 +299,7 @@ jobs:
steps:
- checkout
- update-submodule
- - install-deps
+ - install-deps-gtk3
- install-deps-golang
- download-toolchain
- configure-tsan
@@ -278,7 +311,7 @@ jobs:
steps:
- checkout
- update-submodule
- - install-deps
+ - install-deps-gtk3
- install-deps-golang
- download-toolchain
- configure-msan
@@ -290,6 +323,10 @@ workflows:
jobs:
- basic
+ x64-basic-qt6:
+ jobs:
+ - basic-qt6
+
x64-basic-gcc:
jobs:
- basic-gcc
diff --git a/yass/.gitattributes b/yass/.gitattributes
index e0a769395f..625ecce2cf 100644
--- a/yass/.gitattributes
+++ b/yass/.gitattributes
@@ -4,3 +4,5 @@
*.crt text eol=lf
*.sh text eol=lf
*.patch text eol=lf
+*.ts text eol=lf
+*.qm binary
diff --git a/yass/.github/workflows/clang-tidy.yml b/yass/.github/workflows/clang-tidy.yml
index 881c956428..a0a4a9136d 100644
--- a/yass/.github/workflows/clang-tidy.yml
+++ b/yass/.github/workflows/clang-tidy.yml
@@ -18,7 +18,7 @@ on:
schedule:
- cron: '0 16 * * *'
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
win-clang-tidy:
@@ -42,7 +42,7 @@ jobs:
# unshallow must come first otherwise submodule may be get unshallowed
git fetch --tags --unshallow
git submodule update --init --depth 1
- - name: Cache clang, nasm and wixtoolset 3
+ - name: Cache clang, nasm, nsis and wixtoolset 3
id: clang-cache
uses: actions/cache@v4
with:
@@ -50,7 +50,8 @@ jobs:
third_party/nasm
third_party/llvm-build/Release+Asserts
third_party/wix311
- key: ${{ runner.os }}-toolchain-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
+ third_party/nsis
+ key: ${{ runner.os }}-toolchain-nsis-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
- name: Cache golang
uses: actions/cache@v4
with:
@@ -64,7 +65,7 @@ jobs:
run: |
cd tools
go build
- - name: "Download dependency: clang, nasm and wixtoolset 3"
+ - name: "Download dependency: clang, nasm, nsis and wixtoolset 3"
if: ${{ steps.clang-cache.outputs.cache-hit != 'true' }}
run: |
scripts\download-toolchain.bat
@@ -86,9 +87,6 @@ jobs:
set "VSCMD_START_DIR=%CD%"
set Platform=${{ matrix.arch }}
- set "Path=%CD%\third_party\nasm;%Path%"
- set "Path=%CD%\third_party\wix311;%Path%"
-
call "%vsdevcmd%" -arch=%Platform% -host_arch=amd64 -winsdk=%Winsdk% -no_logo -vcvars_ver=%VCToolsVersion%
tools\build -clang-tidy-mode "-clang-tidy-executable-path=%CD%/third_party/llvm-build/Release+Asserts/bin/clang-tidy.exe" -msvc-tgt-arch=${{ matrix.arch }} -msvc-crt-linkage=${{ matrix.crt-linkage }} -build-test -build-benchmark -no-packaging || exit /b
diff --git a/yass/.github/workflows/compiler.yml b/yass/.github/workflows/compiler.yml
index a711034433..2e2e5d4d3d 100644
--- a/yass/.github/workflows/compiler.yml
+++ b/yass/.github/workflows/compiler.yml
@@ -33,7 +33,7 @@ concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
win-compiler-compatible-2022:
@@ -56,7 +56,7 @@ jobs:
# unshallow must come first otherwise submodule may be get unshallowed
git fetch --tags --unshallow
git submodule update --init --depth 1
- - name: Cache clang, nasm and wixtoolset 3
+ - name: Cache clang, nasm, nsis and wixtoolset 3
id: clang-cache
uses: actions/cache@v4
with:
@@ -64,7 +64,8 @@ jobs:
third_party/nasm
third_party/llvm-build/Release+Asserts
third_party/wix311
- key: ${{ runner.os }}-toolchain-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
+ third_party/nsis
+ key: ${{ runner.os }}-toolchain-nsis-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
- name: Cache msvc curl
id: curl-cache
uses: actions/cache@v4
@@ -87,7 +88,7 @@ jobs:
run: |
cd tools
go build
- - name: "Download dependency: clang, nasm and wixtoolset 3"
+ - name: "Download dependency: clang, nasm, nsis and wixtoolset 3"
if: ${{ steps.clang-cache.outputs.cache-hit != 'true' }}
run: |
scripts\download-toolchain.bat
@@ -113,9 +114,6 @@ jobs:
set "VSCMD_START_DIR=%CD%"
set Platform=${{ matrix.arch }}
- set "Path=%CD%\third_party\nasm;%Path%"
- set "Path=%CD%\third_party\wix311;%Path%"
-
call "%vsdevcmd%" -arch=%Platform% -host_arch=amd64 -winsdk=%Winsdk% -no_logo -vcvars_ver=%VCToolsVersion%
tools\build -msvc-tgt-arch=${{ matrix.arch }} -msvc-crt-linkage=${{ matrix.crt-linkage }} -use-libcxx=false -build-test -no-packaging || exit /b
@@ -160,7 +158,8 @@ jobs:
third_party/nasm
third_party/llvm-build/Release+Asserts
third_party/wix311
- key: ${{ runner.os }}-toolchain-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
+ third_party/nsis
+ key: ${{ runner.os }}-toolchain-nsis-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
- name: Cache mingw64 llvm
id: mingw-cache
uses: actions/cache@v4
diff --git a/yass/.github/workflows/releases-android-binary.yml b/yass/.github/workflows/releases-android-binary.yml
index 9873babfb0..64fcefec5d 100644
--- a/yass/.github/workflows/releases-android-binary.yml
+++ b/yass/.github/workflows/releases-android-binary.yml
@@ -35,7 +35,7 @@ concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
android-binary-release:
diff --git a/yass/.github/workflows/releases-deb.yml b/yass/.github/workflows/releases-deb.yml
index f93dc99fd1..5d260f8bff 100644
--- a/yass/.github/workflows/releases-deb.yml
+++ b/yass/.github/workflows/releases-deb.yml
@@ -35,7 +35,7 @@ concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
DH_QUIET: 1
jobs:
diff --git a/yass/.github/workflows/releases-freebsd-binary.yml b/yass/.github/workflows/releases-freebsd-binary.yml
index 897563ec69..c638f404dc 100644
--- a/yass/.github/workflows/releases-freebsd-binary.yml
+++ b/yass/.github/workflows/releases-freebsd-binary.yml
@@ -35,7 +35,7 @@ concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
freebsd-binary-release:
diff --git a/yass/.github/workflows/releases-ios.yml b/yass/.github/workflows/releases-ios.yml
index 561ef3ac3d..beb820e860 100644
--- a/yass/.github/workflows/releases-ios.yml
+++ b/yass/.github/workflows/releases-ios.yml
@@ -21,7 +21,7 @@ concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
ios-simulator-release:
diff --git a/yass/.github/workflows/releases-linux-binary.yml b/yass/.github/workflows/releases-linux-binary.yml
index 65cfe6f1c6..de19f31365 100644
--- a/yass/.github/workflows/releases-linux-binary.yml
+++ b/yass/.github/workflows/releases-linux-binary.yml
@@ -35,7 +35,7 @@ concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
linux-binary-release:
diff --git a/yass/.github/workflows/releases-macos.yml b/yass/.github/workflows/releases-macos.yml
index ea7c85d9a0..f358f1d566 100644
--- a/yass/.github/workflows/releases-macos.yml
+++ b/yass/.github/workflows/releases-macos.yml
@@ -35,7 +35,7 @@ concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
mac-release:
diff --git a/yass/.github/workflows/releases-mingw-new.yml b/yass/.github/workflows/releases-mingw-new.yml
index 0d308d9b47..a3a9c2d631 100644
--- a/yass/.github/workflows/releases-mingw-new.yml
+++ b/yass/.github/workflows/releases-mingw-new.yml
@@ -35,7 +35,7 @@ concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
mingw64-release:
@@ -47,7 +47,7 @@ jobs:
- arch: i686
variant: msvcrt
- arch: x86_64
- variant: msvcrt
+ variant: ucrt
- arch: aarch64
variant: ucrt
env:
@@ -59,14 +59,12 @@ jobs:
# unshallow must come first otherwise submodule may be get unshallowed
git fetch --tags --unshallow
git submodule update --init --depth 1
- - name: Cache clang, nasm and wixtoolset 3
+ - name: Cache clang
id: clang-cache
uses: actions/cache@v4
with:
path: |
- third_party/nasm
third_party/llvm-build/Release+Asserts
- third_party/wix311
key: ${{ runner.os }}-toolchain-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
- name: Cache mingw64 llvm
id: mingw-cache
diff --git a/yass/.github/workflows/releases-mingw.yml b/yass/.github/workflows/releases-mingw.yml
index 674713935e..629f8ebc05 100644
--- a/yass/.github/workflows/releases-mingw.yml
+++ b/yass/.github/workflows/releases-mingw.yml
@@ -18,7 +18,7 @@ on:
schedule:
- cron: '0 16 * * *'
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
mingw64-release:
diff --git a/yass/.github/workflows/releases-openwrt-binary.yml b/yass/.github/workflows/releases-openwrt-binary.yml
index dd30030e61..7bf5d58b18 100644
--- a/yass/.github/workflows/releases-openwrt-binary.yml
+++ b/yass/.github/workflows/releases-openwrt-binary.yml
@@ -35,7 +35,7 @@ concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
openwrt-binary-release:
diff --git a/yass/.github/workflows/releases-rpm.yml b/yass/.github/workflows/releases-rpm.yml
index 959dcd5c81..cb498b8299 100644
--- a/yass/.github/workflows/releases-rpm.yml
+++ b/yass/.github/workflows/releases-rpm.yml
@@ -35,7 +35,7 @@ concurrency:
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
docker_publish:
diff --git a/yass/.github/workflows/releases-src.yml b/yass/.github/workflows/releases-src.yml
index 368425e74d..e51b36f708 100644
--- a/yass/.github/workflows/releases-src.yml
+++ b/yass/.github/workflows/releases-src.yml
@@ -55,7 +55,7 @@ jobs:
- name: Populate depedencies
run: |
sudo apt-get update -qq
- sudo apt-get install -y libarchive-tools
+ sudo apt-get install -y libarchive-tools zstd
- name: Build tarball and zip archive
run: |
./scripts/build-src.sh
diff --git a/yass/.github/workflows/releases-windows.yml b/yass/.github/workflows/releases-windows.yml
index d237e5f4aa..0ed30dbd7a 100644
--- a/yass/.github/workflows/releases-windows.yml
+++ b/yass/.github/workflows/releases-windows.yml
@@ -24,7 +24,7 @@ defaults:
run:
shell: cmd
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
windows-release:
@@ -44,7 +44,7 @@ jobs:
# unshallow must come first otherwise submodule may be get unshallowed
git fetch --tags --unshallow
git submodule update --init --depth 1
- - name: Cache clang, nasm and wixtoolset 3
+ - name: Cache clang, nasm, nsis and wixtoolset 3
id: clang-cache
uses: actions/cache@v4
with:
@@ -52,7 +52,8 @@ jobs:
third_party/nasm
third_party/llvm-build/Release+Asserts
third_party/wix311
- key: ${{ runner.os }}-toolchain-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
+ third_party/nsis
+ key: ${{ runner.os }}-toolchain-nsis-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
- name: Cache msvc curl
id: curl-cache
uses: actions/cache@v4
@@ -89,7 +90,7 @@ jobs:
run: |
cd tools
go build
- - name: "Download dependency: clang, nasm and wixtoolset 3"
+ - name: "Download dependency: clang, nasm, nsis and wixtoolset 3"
if: ${{ steps.clang-cache.outputs.cache-hit != 'true' }}
run: |
scripts\download-toolchain.bat
@@ -124,9 +125,6 @@ jobs:
set "VSCMD_START_DIR=%CD%"
set Platform=${{ matrix.arch }}
- set "Path=%CD%\third_party\nasm;%Path%"
- set "Path=%CD%\third_party\wix311;%Path%"
-
call "%vsdevcmd%" -arch=%Platform% -host_arch=amd64 -winsdk=%Winsdk% -no_logo -vcvars_ver=%VCToolsVersion%
tools\build -msvc-tgt-arch=${{ matrix.arch }} -msvc-crt-linkage=${{ matrix.crt-linkage }} -build-benchmark -build-test || exit /b
@@ -171,7 +169,7 @@ jobs:
# unshallow must come first otherwise submodule may be get unshallowed
git fetch --tags --unshallow
git submodule update --init --depth 1
- - name: Cache clang, nasm and wixtoolset 3
+ - name: Cache clang, nasm, nsis and wixtoolset 3
id: clang-cache
uses: actions/cache@v4
with:
@@ -179,7 +177,8 @@ jobs:
third_party/nasm
third_party/llvm-build/Release+Asserts
third_party/wix311
- key: ${{ runner.os }}-toolchain-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
+ third_party/nsis
+ key: ${{ runner.os }}-toolchain-nsis-${{ hashFiles('CLANG_REVISION') }}-v${{ env.CACHE_EPOCH }}
- name: Cache golang
uses: actions/cache@v4
with:
@@ -193,7 +192,7 @@ jobs:
run: |
cd tools
go build
- - name: "Download dependency: clang, nasm and wixtoolset 3"
+ - name: "Download dependency: clang, nasm, nsis and wixtoolset 3"
if: ${{ steps.clang-cache.outputs.cache-hit != 'true' }}
run: |
scripts\download-toolchain.bat
@@ -224,9 +223,6 @@ jobs:
set Platform=${{ matrix.arch }}
set VSCMD_ARG_TGT_ARCH=${{ matrix.arch }}
- set "Path=%CD%\third_party\nasm;%Path%"
- set "Path=%CD%\third_party\wix311;%Path%"
-
call "scripts\callxp-%Platform%.cmd"
tools\build -msvc-tgt-arch=${{ matrix.arch }} -msvc-crt-linkage=${{ matrix.crt-linkage }} -msvc-allow-xp -build-test -build-benchmark || exit /b
diff --git a/yass/.github/workflows/sanitizers.yml b/yass/.github/workflows/sanitizers.yml
index d2634bbb77..6589b1d1e0 100644
--- a/yass/.github/workflows/sanitizers.yml
+++ b/yass/.github/workflows/sanitizers.yml
@@ -18,7 +18,7 @@ on:
schedule:
- cron: '0 16 * * *'
env:
- CACHE_EPOCH: 126-1
+ CACHE_EPOCH: 127-3
GOPROXY: direct
jobs:
sanitizer-linux:
diff --git a/yass/.gitignore b/yass/.gitignore
index a425f67166..b79a065d4d 100644
--- a/yass/.gitignore
+++ b/yass/.gitignore
@@ -11,6 +11,7 @@ sscxx
*.zip
/third_party/llvm-build
/third_party/vcredist
+/third_party/nsis
/third_party/nasm
/third_party/wix311
/third_party/mingw32
@@ -57,6 +58,7 @@ sscxx
*.bz2
*.rpm
*.deb
+*.zst
/tools/build
/build-*
/cmake-build-*
diff --git a/yass/BUILDING.md b/yass/BUILDING.md
index 3fd02b7e4c..92eb0bf9ed 100644
--- a/yass/BUILDING.md
+++ b/yass/BUILDING.md
@@ -1,17 +1,26 @@
# Building Instruments
-## Build Binary
+## Windows (MinGW)
-### Windows (MinGW llvm-mingw)
+1. Install [Chocolatey][chocolatey] Package Manager.
-1. Make sure you have [Git for Windows][gitforwindows] installed.
-2. Make sure you have [Perl], [CMake] (3.13 or later), [Ninja], [Golang] and [NASM] installed and put them in `PATH`.
+Run the following command in ADMINISTRATIVE powershell:
+```
+Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+```
+
+2. Install required tools via [Chocolatey].
+
+Run the following command in ADMINISTRATIVE shell:
+```
+choco install 7zip.install
+choco install git.install
+choco install strawberryperl --version=5.38.2.2
+choco install cmake.portable --version=3.28.5
+choco install ninja
+choco install golang
+```
- * A recent version of Perl is required.
- On Windows, [Active State Perl](http://www.activestate.com/activeperl/) has been reported to work, as has MSYS Perl.
- [Strawberry Perl](http://strawberryperl.com/) also works but it adds [GCC] to `PATH`,
- which can confuse some build tools when identifying the compiler
- (removing `C:\Strawberry\c\bin` from `PATH` should resolve any problems).
3. Open `Git Bash` from Start Menu and run
```
@@ -20,9 +29,43 @@ cd yass
./scripts/build-mingw.sh
```
-4. Enjoy
+## Windows (MSYS2)
-### Windows (MSVC)
+1. Download and run MSYS2 installer from [MSYS2 site][msys2].
+2. Install required tools
+
+Run `MSYS2 CLANG64` in Start Menu:
+```
+pacman -S mingw-w64-clang-x86_64-clang \
+ mingw-w64-clang-x86_64-gcc-compat \
+ mingw-w64-clang-x86_64-perl \
+ mingw-w64-clang-x86_64-go \
+ mingw-w64-clang-x86_64-cmake \
+ mingw-w64-clang-x86_64-ninja \
+ mingw-w64-clang-x86_64-nasm \
+ git
+```
+
+Notes: you might need to get `GOROOT` manually after install `mingw-w64-clang-x86_64-go`
+package by running:
+```
+export GOROOT=/clang64/lib/go
+export GOPATH=/clang64
+```
+
+3. Compiling the program.
+
+Run `MSYS2 CLANG64` in Start Menu:
+```
+git clone https://github.com/Chilledheart/yass
+cd yass
+mkdir build
+cd build
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGUI=on ..
+ninja yass
+```
+
+## Windows (MSVC)
1. Make sure you have [Git for Windows][gitforwindows] installed.
2. Make sure you have [Perl], [CMake] (3.13 or later), [Ninja], [Golang] and [NASM] installed and put them in `PATH`.
@@ -45,10 +88,9 @@ cd yass
Notes: please make sure you have [LLVM][llvm-win64] (17.0 or above).
-5. Run `x64 Native Tools Command Prompt for VS 2019 (or 2022)` in Start Menu.
-
-6. Compile the program with Release configuration.
+5. Compile the program with Release configuration.
+Run `x64 Native Tools Command Prompt for VS 2019 (or 2022)` in Start Menu:
```
git clone https://github.com/Chilledheart/yass
cd yass
@@ -60,99 +102,28 @@ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGUI=on ..
ninja yass
```
-### Windows (MinGW MSYS2)
+## macOS
-1. Install MSYS2 Package from [official site][msys2].
-2. Run MSYS2 CLANG64 in Start Menu.
-3. Install required tools
-```
-pacman -S mingw-w64-clang-x86_64-clang \
- mingw-w64-clang-x86_64-gcc-compat \
- mingw-w64-clang-x86_64-perl \
- mingw-w64-clang-x86_64-go \
- mingw-w64-clang-x86_64-cmake \
- mingw-w64-clang-x86_64-ninja \
- mingw-w64-clang-x86_64-nasm \
- git
-```
-
-Notes: you might need to get `GOROOT` manually after install `mingw-w64-clang-x86_64-go`
-package by running:
-```
-export GOROOT=/clang64/lib/go
-export GOPATH=/clang64
-```
-
-4. Compiling the program.
-```
-git clone https://github.com/Chilledheart/yass
-cd yass
-mkdir build
-cd build
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGUI=on ..
-ninja yass
-```
-5. Enjoy
-
-### macOS
-
-1. Make sure you have [Xcode Command Line Tools][xcode-commandline] installed ([Xcode] if possible):
+1. Make sure you have both of [Xcode] and [Homebrew] installed:
Run in `Terminal`:
```
+xcode-select -s /Applications/Xcode.app
xcode-select --install
+xcodebuild -runFirstLaunch
```
-2. Install the required build tools...
-(for [Homebrew] users)
+Run in `Terminal`:
+```
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+```
+2. Install the required build tools via homebrew
Run in `Terminal`:
```
brew install ninja cmake go p7zip
```
-(for [MacPorts] users)
-
-Run in `Terminal`:
-```
-sudo port install ninja cmake go p7zip
-```
-
-(for people who don't use [MacPorts] or [Homebrew])
-
-1. [CMake]
-
-Run in Terminal:
-```
-cd $TMPDIR
-curl -L -O https://github.com/Kitware/CMake/releases/download/v3.25.1/cmake-3.25.1-macos10.10-universal.dmg
-hdiutil attach cmake-3.25.1-macos10.10-universal.dmg
-ditto /Volumes/cmake-3.25.1-macos10.10-universal/CMake.app /Applications/CMake.app
-hdiutil detach /Volumes/cmake-3.25.1-macos10.10-universal
-echo 'export PATH="/Applications/CMake.app/Contents/bin:${PATH}"' >> .zprofile
-export PATH="/Applications/CMake.app/Contents/bin:${PATH}"
-```
-2. [Ninja]
-
-Run in Terminal:
-```
-cd $TMPDIR
-curl -L -O https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip
-unzip ninja-mac.zip
-sudo install -m 755 ninja /usr/local/bin/ninja
-```
-3. [Golang]
-
-Run in Terminal:
-```
-cd $TMPDIR
-# Change to https://go.dev/dl/go1.18.10.darwin-arm64.tar.gz if you are using Apple Silicon
-curl -L -O https://go.dev/dl/go1.18.10.darwin-amd64.tar.gz
-sudo tar -C /usr/local -xzf go1.18.10.darwin-amd64.tar.gz
-echo 'export PATH="/usr/local/go/bin:${PATH}"' >> .zprofile
-export PATH="/usr/local/go/bin:${PATH}"
-```
-
3. Compile the program with Release configuration.
```
git clone https://github.com/Chilledheart/yass
@@ -163,71 +134,59 @@ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGUI=on ..
ninja yass
```
-
-### Debian/Ubuntu
+## Debian/Ubuntu
1. Install GNU C++ Compiler:
+
+Run in `Console`:
```
sudo apt-get install -y build-essential git
```
+
2. Install required dependencies:
+
+Run in `Console`:
```
-sudo apt-get install -y \
- cmake \
- ninja-build \
- pkg-config \
- perl \
- gettext \
- libgtk-3-dev
+sudo apt-get install -y cmake ninja-build pkg-config perl gettext libgtk-3-dev golang
```
-Notes: please make sure you have [GCC] (7.1 or above) or [Clang] (17.0 or above) and [CMake] (3.13 or above).
-
-For [GCC], cmake argument `-DUSE_LIBCXX=off` should be passed to disable libc++ build under gcc.
+Notes: please make sure you have [GCC] (7.1 or above) and [CMake] (3.13 or above).
You might want to give these APT/PPA sites a look if the requirements are not meet:
* [PPA for Ubuntu Toolchain](https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test)
* [Kitware CMake](https://apt.kitware.com/)
-3. Install Golang manually:
-```
-cd /tmp
-wget https://go.dev/dl/go1.18.10.linux-amd64.tar.gz
-sudo tar -C /usr/local -xzf go1.18.10.linux-amd64.tar.gz
-echo 'export PATH="/usr/local/go/bin:${PATH}"' >> ~/.bashrc
-export PATH="/usr/local/go/bin:${PATH}"
-```
-4. Compile the program with Release configuration.
+3. Compile the program with Release configuration.
+
+Run in `Console`:
```
git clone https://github.com/Chilledheart/yass
cd yass
mkdir build
cd build
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGUI=on ..
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGUI=on -DENABLE_GOLD=off -DUSE_LIBCXX=off -DUSE_GTK4=off ..
ninja yass
```
-### Fedora/RHEL/CentOS/AlmaLinux/Rocky Linux
+## Fedora/RHEL/CentOS/AlmaLinux/Rocky Linux
1. Install GNU C++ Compiler:
+
+Run in `Console`:
```
-sudo yum install -y gcc gcc-c++ \
- make python bash coreutils diffutils patch git
+sudo yum install -y gcc gcc-c++ make python bash coreutils diffutils patch git
```
2. Install required dependencies:
+
+Run in `Console`:
```
-sudo yum install -y \
- cmake \
- ninja-build \
- pkg-config \
- perl \
- gtk3-devel \
- gettext \
- golang
+sudo yum install -y cmake ninja-build pkg-config perl gtk3-devel gettext golang
+```
+or (for RHEL/CentOS users)
+```
+sudo yum install -y cmake3 ninja-build pkg-config perl gtk3-devel gettext golang
```
-Notes: please make sure you have [GCC] (7.1 or above) or [Clang] (17.0 or above) and [CMake] (3.13 or above).
-
-For [GCC], cmake argument `-DUSE_LIBCXX=off` should be passed to disable libc++ build under gcc.
+Notes: please make sure you have [GCC] (7.1 or above) and [CMake] (3.13 or above).
You might want to enable CodeReady (for RHEL), PowerTools (for CentOS) and EPEL repo before above commands:
@@ -247,140 +206,51 @@ subscription-manager repos --enable rhel-*-optional-rpms \
* [EPEL] 9: `yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm`
3. Compile the program with Release configuration.
+
+Run in `Console`:
```
git clone https://github.com/Chilledheart/yass
cd yass
mkdir build
cd build
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGUI=on ..
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGUI=on -DENABLE_GOLD=off -DUSE_LIBCXX=off -DUSE_GTK4=off ..
ninja yass
```
-### FreeBSD
-1. Install Clang Compiler (Optional):
+## FreeBSD
+1. Install Clang Compiler:
It is impossible to upgrade system compiler without upgrading OS,
-so you can install latest [Clang]:
+so you have to install latest [Clang] (not required since FreeBSD 14.1):
+
+Run in `Console`:
```
-pkg install llvm17-lite
+pkg install llvm18-lite
```
-Notes: please make sure you have [Clang] (17.0 or above) and [CMake] (3.13 or above).
2. Install required dependencies:
-```
-pkg install -y \
- git \
- cmake \
- ninja \
- pkgconf \
- perl5 \
- gettext \
- gtk3 \
- go
-```
-
-Notes: please install `src.txz` package of system otherwise you might need to create symbolics of unwind.h like below:
+Run in `Console`:
```
-ln -sf /usr/include/c++/v1/unwind.h /usr/include/unwind.h
-ln -sf /usr/include/c++/v1/unwind-arm.h /usr/include/unwind-arm.h
-ln -sf /usr/include/c++/v1/unwind-itanium.h /usr/include/unwind-itanium.h
+pkg install -y git cmake ninja pkgconf perl5 gettext gtk3 go
```
-Notes: Not required since FreeBSD 13.1
-
3. Compile the program with Release configuration.
+
+Run in `Console`:
```
git clone https://github.com/Chilledheart/yass
cd yass
-export PATH="/usr/local/llvm17/bin:$PATH"
+export PATH="/usr/local/llvm18/bin:$PATH"
export CC=clang
export CXX=clang++
mkdir build
cd build
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGUI=on ..
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DGUI=on -DUSE_GTK4=off ..
ninja yass
```
-## Build Packaging
-
-### MinGW/Packaging
-
-Make sure you have [Golang] installed on your system.
-
-Run in `Git Bash` in Start Menu:
-```
-./scripts/build-mingw.sh
-```
-
-### macOS/Packaging
-
-Make sure you have [Golang] installed on your system.
-
-Run in `Terminal`:
-```
-cd tools
-go build
-cd ..
-./tools/build
-```
-
-### Debian/Packaging
-
-1. Install Packaging Tools
-```
-sudo apt-get install -y git build-essential fakeroot devscripts debhelper
-```
-
-2. Install [Clang] and put its binaries in `PATH`
-
-3. Generate Packages under parent directory
-```
-export CC=clang
-export CXX=clang++
-./scripts/build-deb.sh
-```
-
-### Fedora/RHEL/CentOS/AlmaLinux/Rocky Linux Packaging
-
-1. Install Packaging Tools
-```
-sudo yum install -y gcc gcc-c++ \
- rpm-build rpm-devel rpmlint make python bash coreutils diffutils patch rpmdevtools
-```
-
-2. Install [Clang] and put its binaries in `PATH`
-
-3. Generate Packages under current directory
-```
-export CC=clang
-export CXX=clang++
-./scripts/build-rpm.sh
-```
-
-### FreeBSD/Packaging
-
-Make sure you have [Golang] installed on your system.
-
-Run in Terminal:
-```
-cd tools
-go build
-cd ..
-./tools/build
-```
-
-### Android/Packaging
-See [android's README.md](android/README.md)
-
-### HarmonyOS/Packaging
-See [harmonyOS's README.md](harmony/README.md)
-
-### iOS/Packaging
-Make sure you have Xcode installed on your system.
-
-TBD
-
+[chocolatey]: https://chocolatey.org/install#individual
[gitforwindows]: https://gitforwindows.org/
[visualstudio]: https://visualstudio.microsoft.com/downloads/
[Perl]: https://www.perl.org/get.html
@@ -390,11 +260,8 @@ TBD
[Golang]: https://go.dev/dl/
[GCC]: https://gcc.gnu.org/
[NASM]: https://www.nasm.us/
-[xcode-commandline]: https://developer.apple.com/download/more/
[Xcode]: https://apps.apple.com/us/app/xcode/id497799835?mt=12
-[MacPorts]: https://www.macports.org/install.php
[HomeBrew]: https://docs.brew.sh/Installation
-[python]: https://www.python.org/downloads/
-[llvm-win64]: https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/LLVM-17.0.6-win64.exe
+[llvm-win64]: https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.6/LLVM-18.1.6-win64.exe
[msys2]: https://www.msys2.org/
[EPEL]: https://docs.fedoraproject.org/en-US/epel
diff --git a/yass/CLANG_REVISION b/yass/CLANG_REVISION
index cb74c04925..7c5d11a59c 100644
--- a/yass/CLANG_REVISION
+++ b/yass/CLANG_REVISION
@@ -1 +1 @@
-llvmorg-19-init-9433-g76ea5feb-1
\ No newline at end of file
+llvmorg-19-init-10646-g084e2b53-7
\ No newline at end of file
diff --git a/yass/CMakeLists.txt b/yass/CMakeLists.txt
index 46d16360f6..09bc4a3ae0 100644
--- a/yass/CMakeLists.txt
+++ b/yass/CMakeLists.txt
@@ -425,10 +425,6 @@ option(CLI "Build with cli." ON)
option(SERVER "Build with server." ON)
option(GUI "Build against GUI." OFF)
-cmake_dependent_option(USE_GTK4
- "Build with gtk4 (GUI)" ON
- "GUI AND NOT WIN32 AND NOT APPLE AND NOT OHOS AND NOT ANDROID" OFF)
-
option(BUILD_BENCHMARKS "Build with benchmark." OFF)
option(BUILD_SHARED_LIBS "Build with shared libraries." OFF)
option(BUILD_TESTS "Build with test." OFF)
@@ -504,6 +500,14 @@ option(USE_MOLD "Build with mold linker" OFF)
option(USE_LLD "Build with lld linker" OFF)
option(USE_GOLD "Build with gold linker" OFF)
+cmake_dependent_option(USE_QT6
+ "Build with Qt6 (GUI)" OFF
+ "GUI AND NOT WIN32 AND NOT APPLE AND NOT OHOS AND NOT ANDROID" OFF)
+
+cmake_dependent_option(USE_GTK4
+ "Build with gtk4 (GUI)" ON
+ "GUI AND NOT USE_QT6 AND NOT WIN32 AND NOT APPLE AND NOT OHOS AND NOT ANDROID" OFF)
+
# Dynamic users are supported from version 235
# see https://0pointer.net/blog/dynamic-users-with-systemd.html
if (USE_OLD_SYSTEMD_SERVICE)
@@ -1777,6 +1781,11 @@ if (WIN32)
set(CMAKE_C_CREATE_CONSOLE_EXE "-mconsole -Xlinker --subsystem -Xlinker console${SUBSYSTEM_VERSION_SUFFIX}")
set(CMAKE_CXX_CREATE_CONSOLE_EXE "-mconsole -Xlinker --subsystem -Xlinker console${SUBSYSTEM_VERSION_SUFFIX}")
endif()
+
+ if (MINGW AND MINGW_MSVCRT100)
+ # see https://github.com/mingw-w64/mingw-w64/blob/master/mingw-w64-headers/configure.ac#L172
+ add_definitions(-D__MSVCRT_VERSION__=0xA00)
+ endif()
endif()
# On windows preload settings
@@ -1934,6 +1943,28 @@ endif()
if (HAVE_MALLINFO2)
add_definitions(-DHAVE_MALLINFO2)
endif()
+if (MINGW)
+ # see https://github.com/mingw-w64/mingw-w64/blob/master/mingw-w64-headers/crt/_mingw.h.in#L215
+ # 0xE00 stands for UCRT
+ check_c_source_compiles ("
+ #include <_mingw.h>
+ #if __MSVCRT_VERSION__ < 0x0E00 && !defined(_UCRT)
+ int main() {}
+ #endif
+ " HAVE_MINGW_MSVCRT)
+ check_c_source_compiles ("
+ #include <_mingw.h>
+ #if __MSVCRT_VERSION__ >= 0x0E00 || defined(_UCRT)
+ int main() {}
+ #endif
+ " HAVE_MINGW_UCRT)
+ if (HAVE_MINGW_MSVCRT)
+ list(APPEND YASS_APP_FEATURES "mingw msvcrt")
+ endif()
+ if (HAVE_MINGW_UCRT)
+ list(APPEND YASS_APP_FEATURES "mingw ucrt")
+ endif()
+endif()
# *****************************************************************************************
# Core Support Libraries
@@ -2096,6 +2127,15 @@ elseif (GUI)
if (NOT PKG_CONFIG_FOUND)
message(WARNING "pkg-config (required to search gtk+ path) not found, disabling GUI build")
set(GUI off)
+ elseif(USE_QT6)
+ find_package(Qt6 REQUIRED Widgets Gui OPTIONAL_COMPONENTS LinguistTools)
+ set(GUI_USE_FILE "")
+ set(GUI_INCLUDE_DIRS "")
+ set(GUI_DEFINITIONS "")
+ set(GUI_C_CXX_FLAGS "")
+ set(GUI_LIBRARY_DIRS "")
+ set(GUI_LIBRARIES Qt::Widgets Qt::Gui)
+ set(GUI_FLAVOUR "qt6")
else()
pkg_check_modules(FONTCONFIG fontconfig)
if (NOT FONTCONFIG_FOUND)
@@ -3839,6 +3879,171 @@ if (ENABLE_CLANG_TIDY)
set(CMAKE_OBJCXX_CLANG_TIDY "${CLANG_TIDY_EXECUTABLE}")
endif()
+# *****************************************************************************************
+# delayload code
+# *****************************************************************************************
+if (WIN32)
+ # This is a superset of all the delayloads needed for chrome.exe, chrome.dll,
+ # and chrome_elf.dll. The linker will automatically ignore anything which is not
+ # linked to the binary at all (it is harmless to have an unmatched /delayload).
+ #
+ # We delayload most libraries as the dlls are simply not required at startup (or
+ # at all, depending on the process type). In unsandboxed process they will load
+ # when first needed.
+ #
+ # Some dlls open handles when they are loaded, and we may not want them to be
+ # loaded in renderers or other sandboxed processes. Conversely, some dlls must
+ # be loaded before sandbox lockdown.
+ #
+ # Some dlls themselves load others - in particular, to avoid unconditionally
+ # loading user32.dll - we require that the following dlls are all delayloaded:
+ # user32, gdi32, comctl32, comdlg32, cryptui, d3d9, dwmapi, imm32, msi, ole32,
+ # oleacc, rstrtmgr, shell32, shlwapi, and uxtheme.
+ #
+ # Advapi32.dll is unconditionally loaded at process startup on Windows 10, but
+ # on Windows 11 it is not, which makes it worthwhile to delay load it.
+ # Additionally, advapi32.dll exports several functions that are forwarded to
+ # other DLLs such as cryptbase.dll. If calls to those functions are present but
+ # there are some processes where the functions are never called then delay
+ # loading of advapi32.dll avoids pulling in those DLLs (such as cryptbase.dll)
+ # unnecessarily, even if advapi32.dll itself is loaded.
+ if (MSVC)
+ set(DELAY_LDFLAGS
+ "/DELAYLOAD:api-ms-win-core-synch-l1-2-0.dll"
+ "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll"
+ "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll"
+ "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll"
+ "/DELAYLOAD:advapi32.dll"
+ "/DELAYLOAD:comctl32.dll"
+ "/DELAYLOAD:comdlg32.dll"
+ "/DELAYLOAD:credui.dll"
+ "/DELAYLOAD:cryptui.dll"
+ "/DELAYLOAD:d3d11.dll"
+ "/DELAYLOAD:d3d12.dll"
+ "/DELAYLOAD:d3d9.dll"
+ "/DELAYLOAD:dwmapi.dll"
+ "/DELAYLOAD:dxgi.dll"
+ "/DELAYLOAD:dxva2.dll"
+ "/DELAYLOAD:esent.dll"
+ "/DELAYLOAD:fontsub.dll"
+ "/DELAYLOAD:gdi32.dll"
+ "/DELAYLOAD:hid.dll"
+ "/DELAYLOAD:imagehlp.dll"
+ "/DELAYLOAD:imm32.dll"
+ "/DELAYLOAD:msi.dll"
+ "/DELAYLOAD:netapi32.dll"
+ "/DELAYLOAD:ncrypt.dll"
+ "/DELAYLOAD:ole32.dll"
+ "/DELAYLOAD:oleacc.dll"
+ "/DELAYLOAD:pdh.dll"
+ "/DELAYLOAD:propsys.dll"
+ "/DELAYLOAD:psapi.dll"
+ "/DELAYLOAD:rpcrt4.dll"
+ "/DELAYLOAD:rstrtmgr.dll"
+ "/DELAYLOAD:setupapi.dll"
+ "/DELAYLOAD:shell32.dll"
+ "/DELAYLOAD:shlwapi.dll"
+ "/DELAYLOAD:uiautomationcore.dll"
+ "/DELAYLOAD:urlmon.dll"
+ "/DELAYLOAD:user32.dll"
+ "/DELAYLOAD:usp10.dll"
+ "/DELAYLOAD:uxtheme.dll"
+ "/DELAYLOAD:wer.dll"
+ "/DELAYLOAD:wevtapi.dll"
+ "/DELAYLOAD:wininet.dll"
+ "/DELAYLOAD:winusb.dll"
+ "/DELAYLOAD:wsock32.dll"
+ "/DELAYLOAD:wtsapi32.dll"
+
+ "/DELAYLOAD:crypt32.dll"
+ "/DELAYLOAD:dbghelp.dll"
+ "/DELAYLOAD:dhcpcsvc.dll"
+ "/DELAYLOAD:dwrite.dll"
+ "/DELAYLOAD:iphlpapi.dll"
+ "/DELAYLOAD:oleaut32.dll"
+ "/DELAYLOAD:secur32.dll"
+ "/DELAYLOAD:userenv.dll"
+ "/DELAYLOAD:winhttp.dll"
+ "/DELAYLOAD:winmm.dll"
+ "/DELAYLOAD:winspool.drv"
+ "/DELAYLOAD:wintrust.dll"
+ "/DELAYLOAD:ws2_32.dll"
+ "/DELAYLOAD:mswsock.dll"
+ )
+ add_link_options(${DELAY_LDFLAGS})
+ endif()
+ if (MINGW AND USE_LLD)
+ set(DELAY_LDFLAGS
+ "-Wl,--delayload=api-ms-win-core-synch-l1-2-0.dll"
+ "-Wl,--delayload=api-ms-win-core-winrt-error-l1-1-0.dll"
+ "-Wl,--delayload=api-ms-win-core-winrt-l1-1-0.dll"
+ "-Wl,--delayload=api-ms-win-core-winrt-string-l1-1-0.dll"
+ "-Wl,--delayload=advapi32.dll"
+ "-Wl,--delayload=comctl32.dll"
+ "-Wl,--delayload=comdlg32.dll"
+ "-Wl,--delayload=credui.dll"
+ "-Wl,--delayload=cryptui.dll"
+ "-Wl,--delayload=d3d11.dll"
+ "-Wl,--delayload=d3d12.dll"
+ "-Wl,--delayload=d3d9.dll"
+ "-Wl,--delayload=dwmapi.dll"
+ "-Wl,--delayload=dxgi.dll"
+ "-Wl,--delayload=dxva2.dll"
+ "-Wl,--delayload=esent.dll"
+ "-Wl,--delayload=fontsub.dll"
+ "-Wl,--delayload=gdi32.dll"
+ "-Wl,--delayload=hid.dll"
+ "-Wl,--delayload=imagehlp.dll"
+ "-Wl,--delayload=imm32.dll"
+ "-Wl,--delayload=msi.dll"
+ "-Wl,--delayload=netapi32.dll"
+ "-Wl,--delayload=ncrypt.dll"
+ "-Wl,--delayload=ole32.dll"
+ "-Wl,--delayload=oleacc.dll"
+ "-Wl,--delayload=pdh.dll"
+ "-Wl,--delayload=propsys.dll"
+ "-Wl,--delayload=psapi.dll"
+ "-Wl,--delayload=rpcrt4.dll"
+ "-Wl,--delayload=rstrtmgr.dll"
+ "-Wl,--delayload=setupapi.dll"
+ "-Wl,--delayload=shell32.dll"
+ "-Wl,--delayload=shlwapi.dll"
+ "-Wl,--delayload=uiautomationcore.dll"
+ "-Wl,--delayload=urlmon.dll"
+ "-Wl,--delayload=user32.dll"
+ "-Wl,--delayload=usp10.dll"
+ "-Wl,--delayload=uxtheme.dll"
+ "-Wl,--delayload=wer.dll"
+ "-Wl,--delayload=wevtapi.dll"
+ "-Wl,--delayload=wininet.dll"
+ "-Wl,--delayload=winusb.dll"
+ "-Wl,--delayload=wsock32.dll"
+ "-Wl,--delayload=wtsapi32.dll"
+
+ "-Wl,--delayload=crypt32.dll"
+ "-Wl,--delayload=dbghelp.dll"
+ "-Wl,--delayload=dhcpcsvc.dll"
+ "-Wl,--delayload=dwrite.dll"
+ "-Wl,--delayload=iphlpapi.dll"
+ "-Wl,--delayload=oleaut32.dll"
+ "-Wl,--delayload=secur32.dll"
+ "-Wl,--delayload=userenv.dll"
+ "-Wl,--delayload=winhttp.dll"
+ "-Wl,--delayload=winmm.dll"
+ "-Wl,--delayload=winspool.drv"
+ "-Wl,--delayload=wintrust.dll"
+ "-Wl,--delayload=ws2_32.dll"
+ "-Wl,--delayload=mswsock.dll"
+ )
+ add_link_options(${DELAY_LDFLAGS})
+ endif()
+
+ # https://docs.microsoft.com/en-us/cpp/build/reference/understanding-the-helper-function?view=msvc-170
+ # see chrome/app/delay_load_failure_hook_win.cc
+ add_library(delayload_hook STATIC src/delay_load_failure_hook_win.cc)
+ link_libraries(delayload_hook)
+endif()
+
# *****************************************************************************************
# Source code
# *****************************************************************************************
@@ -4323,12 +4528,30 @@ if (GUI)
src/ios/utils.mm
src/ios/utils.cpp
src/ios/main.mm)
+ elseif(GUI_FLAVOUR STREQUAL "qt6")
+ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/qt6/yass.qrc
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/yass.png
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/images)
+ list(APPEND SRC_FILES
+ src/qt6/yass_window.hpp
+ src/qt6/yass_window.cpp
+ src/qt6/yass.hpp
+ src/qt6/yass.cpp
+ src/qt6/option_dialog.hpp
+ src/qt6/option_dialog.cpp
+ src/qt6/tray_icon.hpp
+ src/qt6/tray_icon.cpp
+ src/freedesktop/utils.cpp
+ ${CMAKE_CURRENT_BINARY_DIR}/yass.qrc
+ )
elseif(GUI_FLAVOUR STREQUAL "gtk3")
list(APPEND SRC_FILES
src/gtk/yass.cpp
src/gtk/yass_window.cpp
src/gtk/option_dialog.cpp
src/gtk/utils_gtk.cpp
+ src/freedesktop/utils.cpp
)
include(CompilePo)
create_po_target(yass en src/gtk/yass_en.po)
@@ -4349,7 +4572,9 @@ if (GUI)
src/gtk4/yass.cpp
src/gtk4/yass_window.cpp
src/gtk4/option_dialog.cpp
- src/gtk/utils_gtk.cpp)
+ src/gtk/utils_gtk.cpp
+ src/freedesktop/utils.cpp
+ )
# HOLDPLACE for TODO gettext support
include(CompilePo)
create_po_target(yass en src/gtk4/yass_en.po)
@@ -4380,6 +4605,33 @@ if (GUI)
target_link_libraries(${APP_NAME} PRIVATE tun2proxy)
set_target_properties(${APP_NAME} PROPERTIES
LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/src/harmony/export.lds -u RegisterEntryModule")
+ elseif(GUI_FLAVOUR STREQUAL "qt6")
+ add_executable(${APP_NAME}
+ ${SRC_FILES}
+ ${GUI_USE_FILE}
+ )
+ if (NOT CMAKE_CROSSCOMPILING AND TARGET Qt::lupdate)
+ file(GLOB TS_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/qt6/lang/yass_*.ts")
+ # Custom target to update .ts files and include new strings from source files
+ # Depends on Qt's LinguistTools
+ get_target_property(QT_LUPDATE_EXECUTABLE Qt::lupdate IMPORTED_LOCATION)
+ add_custom_target(update-ts
+ COMMAND ${QT_LUPDATE_EXECUTABLE} -extensions cc,cpp,hpp
+ -locations none
+ -I "${CMAKE_CURRENT_SOURCE_DIR}/src"
+ "${CMAKE_CURRENT_SOURCE_DIR}/src/qt6"
+ -ts ${TS_FILES}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/qt6"
+ VERBATIM
+ COMMAND_EXPAND_LISTS)
+ # Based on https://gist.github.com/giraldeau/546ba5512a74dfe9d8ea0862d66db412
+ set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/src/qt6/lang")
+ qt_add_translation(QM_FILES ${TS_FILES} OPTIONS -removeidentical -silent)
+ target_sources(${APP_NAME} PRIVATE ${QM_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/src/qt6/lang/lang.qrc")
+ else()
+ file(GLOB QM_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/qt6/lang/yass_*.qm")
+ target_sources(${APP_NAME} PRIVATE ${QM_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/src/qt6/lang/lang.qrc")
+ endif()
else()
add_executable(${APP_NAME} WIN32 ${GUI_OPTIONS}
${SRC_FILES}
@@ -4410,6 +4662,14 @@ if (GUI)
elseif(GUI_FLAVOUR STREQUAL "ios")
target_include_directories(${APP_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src/ios)
+ elseif(GUI_FLAVOUR STREQUAL "qt6")
+ target_include_directories(${APP_NAME} PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/qt6)
+ set_target_properties(
+ ${APP_NAME}
+ PROPERTIES AUTOMOC ON
+ AUTOUIC ON
+ AUTORCC ON)
elseif(GUI_FLAVOUR STREQUAL "gtk3")
target_include_directories(${APP_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src/gtk)
@@ -4435,87 +4695,6 @@ if (GUI)
yass_core
)
- if (GUI_FLAVOUR STREQUAL "windows" AND MSVC)
- # Most of the dlls are simply not required at startup (or at all, depending
- # on how the browser is used). The following dlls are interconnected and need to
- # be delayloaded together to ensure user32 does not load too early or at all,
- # depending on the process type: user32, gdi32, comctl32, comdlg32, cryptui,
- # d3d9, dwmapi, imm32, msi, ole32, oleacc, rstrtmgr, shell32, shlwapi, and
- # uxtheme.
- set (DELAY_LDFLAGS
- "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll"
- "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll"
- "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll"
- "/DELAYLOAD:comctl32.dll"
- "/DELAYLOAD:comdlg32.dll"
- "/DELAYLOAD:credui.dll"
- "/DELAYLOAD:cryptui.dll"
- "/DELAYLOAD:d3d11.dll"
- "/DELAYLOAD:d3d9.dll"
- "/DELAYLOAD:dwmapi.dll"
- "/DELAYLOAD:dxgi.dll"
- "/DELAYLOAD:dxva2.dll"
- "/DELAYLOAD:esent.dll"
- "/DELAYLOAD:gdi32.dll"
- "/DELAYLOAD:hid.dll"
- "/DELAYLOAD:imagehlp.dll"
- "/DELAYLOAD:imm32.dll"
- "/DELAYLOAD:msi.dll"
- "/DELAYLOAD:netapi32.dll"
- "/DELAYLOAD:ncrypt.dll"
- "/DELAYLOAD:ole32.dll"
- "/DELAYLOAD:oleacc.dll"
- "/DELAYLOAD:propsys.dll"
- "/DELAYLOAD:psapi.dll"
- "/DELAYLOAD:rpcrt4.dll"
- "/DELAYLOAD:rstrtmgr.dll"
- "/DELAYLOAD:setupapi.dll"
- "/DELAYLOAD:shell32.dll"
- "/DELAYLOAD:shlwapi.dll"
- "/DELAYLOAD:urlmon.dll"
- "/DELAYLOAD:user32.dll"
- "/DELAYLOAD:usp10.dll"
- "/DELAYLOAD:uxtheme.dll"
- "/DELAYLOAD:wer.dll"
- "/DELAYLOAD:wevtapi.dll"
- "/DELAYLOAD:wininet.dll"
- "/DELAYLOAD:winusb.dll"
- "/DELAYLOAD:wsock32.dll"
- "/DELAYLOAD:wtsapi32.dll"
-
- "/DELAYLOAD:advapi32.dll"
- "/DELAYLOAD:crypt32.dll"
- "/DELAYLOAD:dbghelp.dll"
- "/DELAYLOAD:dhcpcsvc.dll"
- "/DELAYLOAD:dwrite.dll"
- "/DELAYLOAD:iphlpapi.dll"
- "/DELAYLOAD:oleaut32.dll"
- "/DELAYLOAD:secur32.dll"
- "/DELAYLOAD:uiautomationcore.dll"
- "/DELAYLOAD:userenv.dll"
- "/DELAYLOAD:winhttp.dll"
- "/DELAYLOAD:winmm.dll"
- "/DELAYLOAD:winspool.drv"
- "/DELAYLOAD:wintrust.dll"
- "/DELAYLOAD:ws2_32.dll"
- )
- # TODO implement own delay load helper
- # https://docs.microsoft.com/en-us/cpp/build/reference/understanding-the-helper-function?view=msvc-170
- # __pfnDliFailureHook2: Delay load failure hook that generates a crash report. By default a failure
- # to delay load will trigger an exception handled by the delay load runtime and
- # this won't generate a crash report.
- # https://docs.microsoft.com/en-us/cpp/build/reference/failure-hooks?view=vs-2019
- # __pfnDliNotifyHook2: verify if loaded libraries are allowed
- # FIXME it seems delay loader's delayimp library isn't be found correctly
- # when it comes with static CRT build.
- string(REPLACE ";" " " DELAY_LDFLAGS "${DELAY_LDFLAGS}")
- set_target_properties(${APP_NAME} PROPERTIES
- LINK_FLAGS "${DELAY_LDFLAGS}")
-
- # enforce default delayload implementation
- target_link_libraries(${APP_NAME} PUBLIC delayimp)
- endif()
-
if (GUI_FLAVOUR STREQUAL "windows" AND MSVC)
set_target_properties(${APP_NAME} PROPERTIES
COMPILE_PDB_NAME ${APP_NAME}
@@ -4802,24 +4981,24 @@ if (GUI)
install(TARGETS ${APP_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
- if (GUI_FLAVOUR STREQUAL "gtk3" OR GUI_FLAVOUR STREQUAL "gtk4")
+ if (GUI_FLAVOUR STREQUAL "qt6" OR GUI_FLAVOUR STREQUAL "gtk3" OR GUI_FLAVOUR STREQUAL "gtk4")
install(FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/it.gui.yass.desktop
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/it.gui.yass.desktop
DESTINATION share/applications)
install(FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/yass.png
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/yass.png
DESTINATION share/pixmaps)
install(DIRECTORY
- ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/16x16
- ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/22x22
- ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/24x24
- ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/32x32
- ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/48x48
- ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/128x128
- ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/256x256
- ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/512x512
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/icons/16x16
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/icons/22x22
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/icons/24x24
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/icons/32x32
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/icons/48x48
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/icons/128x128
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/icons/256x256
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/freedesktop/icons/512x512
DESTINATION share/icons/hicolor)
endif()
endif()
diff --git a/yass/CRASHPAD_COMMIT b/yass/CRASHPAD_COMMIT
index 243eed00ce..fa43ea9b08 100644
--- a/yass/CRASHPAD_COMMIT
+++ b/yass/CRASHPAD_COMMIT
@@ -1 +1 @@
-1174aa4fc3196f478b5b4b77fc970d1cb85cb7cf
\ No newline at end of file
+6af42bc0b22b732fdcebe9f706204e5fb229b209
\ No newline at end of file
diff --git a/yass/Makefile b/yass/Makefile
index 4bff56eef2..a35da50ea9 100644
--- a/yass/Makefile
+++ b/yass/Makefile
@@ -1,5 +1,6 @@
SRC_DIR := src
SRC_FILES := $(wildcard $(SRC_DIR)/*.mm)
+SRC_FILES := $(wildcard $(SRC_DIR)/*.cc)
SRC_FILES := $(wildcard $(SRC_DIR)/*.cpp)
SRC_FILES += $(wildcard $(SRC_DIR)/*.hpp)
SRC_FILES += $(wildcard $(SRC_DIR)/android/*.cpp)
@@ -13,10 +14,14 @@ SRC_FILES += $(wildcard $(SRC_DIR)/core/*.cpp)
SRC_FILES += $(wildcard $(SRC_DIR)/core/*.hpp)
SRC_FILES += $(wildcard $(SRC_DIR)/crypto/*.cpp)
SRC_FILES += $(wildcard $(SRC_DIR)/crypto/*.hpp)
+SRC_FILES += $(wildcard $(SRC_DIR)/freedesktop/*.cpp)
+SRC_FILES += $(wildcard $(SRC_DIR)/freedesktop/*.hpp)
SRC_FILES += $(wildcard $(SRC_DIR)/gtk/*.cpp)
SRC_FILES += $(wildcard $(SRC_DIR)/gtk/*.hpp)
SRC_FILES += $(wildcard $(SRC_DIR)/gtk4/*.cpp)
SRC_FILES += $(wildcard $(SRC_DIR)/gtk4/*.hpp)
+SRC_FILES += $(wildcard $(SRC_DIR)/qt6/*.cpp)
+SRC_FILES += $(wildcard $(SRC_DIR)/qt6/*.hpp)
SRC_FILES += $(wildcard $(SRC_DIR)/harmony/*.cpp)
SRC_FILES += $(wildcard $(SRC_DIR)/harmony/*.hpp)
SRC_FILES += $(wildcard $(SRC_DIR)/i18n/*.cpp)
diff --git a/yass/PACKAGING.md b/yass/PACKAGING.md
new file mode 100644
index 0000000000..56b149725b
--- /dev/null
+++ b/yass/PACKAGING.md
@@ -0,0 +1,80 @@
+# Packaging Instruments
+
+## Prerequisite
+In addition, make sure you have these packages INSTALLED on your system.
+- MinGW: [NSIS] and [7Zip]
+- MSVC: [NSIS], [7Zip] and [wixtoolset][wix3] (put installation path in PATH environment variable)
+- macOS: [Xcode]
+- Debian: fakeroot devscripts debhelper clang
+- Fedora and Fedora-like: rpm-build rpm-devel rpmlint rpmdevtools clang
+
+## Windows (MinGW)/Packaging
+
+Run in `Git Bash` in Start Menu:
+```
+./scripts/build-mingw.sh
+```
+
+## Windows (MSVC)/Packaging
+
+Run `x64 Native Tools Command Prompt for VS 2019 (or 2022)` in Start Menu:
+```
+cd tools
+go build
+cd ..
+./tools/build
+```
+
+## macOS/Packaging
+
+Run in `Terminal`:
+```
+cd tools
+go build
+cd ..
+./tools/build
+```
+
+## Debian/Packaging
+
+Generate Packages under parent directory
+```
+export CC=clang
+export CXX=clang++
+./scripts/build-deb.sh
+```
+
+## Fedora/RHEL/CentOS/AlmaLinux/Rocky Linux Packaging
+
+Generate Packages under current directory
+```
+export CC=clang
+export CXX=clang++
+./scripts/build-rpm.sh
+```
+
+## FreeBSD/Packaging
+
+Generate Packages under current directory
+```
+cd tools
+go build
+cd ..
+./tools/build
+```
+
+## Android/Packaging
+See [android's README.md](android/README.md)
+
+## HarmonyOS/Packaging
+See [harmonyOS's README.md](harmony/README.md)
+
+## iOS/Packaging
+Make sure you have [Xcode] installed on your system.
+
+TBD
+
+[NSIS]: https://nsis.sourceforge.io/Download
+[7Zip]: https://www.7-zip.org/
+[wix3]: https://wixtoolset.org/docs/wix3/
+[Xcode]: https://apps.apple.com/us/app/xcode/id497799835?mt=12
diff --git a/yass/README.md b/yass/README.md
index 2cd28b266f..6028b7d2dc 100644
--- a/yass/README.md
+++ b/yass/README.md
@@ -5,10 +5,13 @@
[](https://github.com/Chilledheart/yass/releases/latest)
[](https://github.com/Chilledheart/yass/releases)
-[](https://aur.archlinux.org/packages/yass-proxy)
-[](https://aur.archlinux.org/packages/yass-proxy-cli)
[](https://formulae.brew.sh/cask/yass)
+[](https://aur.archlinux.org/packages/yass-proxy)
+[](https://aur.archlinux.org/packages/yass-proxy-gtk3)
+[](https://aur.archlinux.org/packages/yass-proxy-qt6)
+[](https://aur.archlinux.org/packages/yass-proxy-cli)
+
yass is an efficient forward proxy client supporting http/socks4/socks4a/socks5 protocol running on PC and mobile devices.
## License
@@ -30,7 +33,7 @@ See [Protecting Chrome Traffic with Hybrid Kyber KEM](https://blog.chromium.org/
### Prebuilt binaries
- Android [download apk](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-android-release-arm64-1.10.4.apk) or [download 32-bit apk](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-android-release-arm-1.10.4.apk)
- iOS [join via TestFlight](https://testflight.apple.com/join/6AkiEq09)
-- Windows [download installer](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-mingw-win7-release-x86_64-1.10.4-system-installer.exe) or [download 32-bit installer](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-mingw-winxp-release-i686-1.10.4-system-installer.exe) [(require vc 2010 runtime)][vs2010_x86] or [download woa arm64 installer](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-mingw-release-aarch64-1.10.4-system-installer.exe)
+- Windows [download installer](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-mingw-win7-release-x86_64-1.10.4-system-installer.exe) [(require KB2999226 below windows 10)][KB2999226] or [download 32-bit installer](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-mingw-winxp-release-i686-1.10.4-system-installer.exe) [(require vc 2010 runtime)][vs2010_x86] or [download woa arm64 installer](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-mingw-release-aarch64-1.10.4-system-installer.exe)
- macOS [download intel dmg](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-macos-release-x64-1.10.4.dmg) or [download apple silicon dmg](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-macos-release-arm64-1.10.4.dmg)
> via homebrew: `brew install --cask yass`
- Linux [download rpm](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass.el7.x86_64.1.10.4.rpm) or [download deb](https://github.com/Chilledheart/yass/releases/download/1.10.4/yass-ubuntu-16.04-xenial_amd64.1.10.4.deb)
@@ -107,4 +110,5 @@ See more at manpage _yass_server(1)_
See [Server Usage](https://github.com/Chilledheart/yass/wiki/Usage:-server-setup) for more.
[license-link]: LICENSE
+[KB2999226]: https://support.microsoft.com/en-us/topic/update-for-universal-c-runtime-in-windows-c0514201-7fe6-95a3-b0a5-287930f3560c
[vs2010_x86]: https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe
diff --git a/yass/cmake/platforms/Android.cmake b/yass/cmake/platforms/Android.cmake
index e90f4c5103..3babd0e5a3 100644
--- a/yass/cmake/platforms/Android.cmake
+++ b/yass/cmake/platforms/Android.cmake
@@ -22,3 +22,12 @@ set(CMAKE_SYSROOT "${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${ANDROID_CURREN
set(CMAKE_CXX_COMPILE_OBJECT
" -o