Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove query-string #5576

Merged
merged 4 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion packages/utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"@walletconnect/window-metadata": "1.0.1",
"detect-browser": "5.3.0",
"elliptic": "6.6.1",
"query-string": "7.1.3",
"uint8arrays": "3.1.0"
},
"devDependencies": {
Expand Down
23 changes: 15 additions & 8 deletions packages/utils/src/misc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { getDocument, getLocation, getNavigator } from "@walletconnect/window-ge
import { getWindowMetadata } from "@walletconnect/window-metadata";
import { ErrorResponse } from "@walletconnect/jsonrpc-utils";
import { IKeyValueStorage } from "@walletconnect/keyvaluestorage";
import * as qs from "query-string";

// -- constants -----------------------------------------//
export const REACT_NATIVE_PRODUCT = "ReactNative";
Expand Down Expand Up @@ -94,14 +93,22 @@ export function getAppId(): string | undefined {

// -- query -----------------------------------------------//

export function appendToQueryString(queryString: string, newQueryParams: any): string {
let queryParams = qs.parse(queryString);

queryParams = { ...queryParams, ...newQueryParams };

queryString = qs.stringify(queryParams);
export function appendToQueryString(
queryString: string,
newQueryParams: Record<string, any>,
): string {
const urlSearchParams = new URLSearchParams(queryString);

for (const key of Object.keys(newQueryParams).sort()) {
if (newQueryParams.hasOwnProperty(key)) {
const value = newQueryParams[key];
if (value !== undefined) {
urlSearchParams.set(key, value);
}
}
}

return queryString;
return urlSearchParams.toString();
}

// -- metadata ----------------------------------------------//
Expand Down
35 changes: 24 additions & 11 deletions packages/utils/src/uri.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import * as qs from "query-string";
import { EngineTypes, RelayerTypes } from "@walletconnect/types";
import { fromBase64 } from "./misc";

Expand Down Expand Up @@ -35,7 +34,11 @@ export function parseUri(str: string): EngineTypes.UriParameters {
const path: string = str.substring(pathStart + 1, pathEnd);
const requiredValues = path.split("@");
const queryString: string = typeof pathEnd !== "undefined" ? str.substring(pathEnd) : "";
const queryParams = qs.parse(queryString);
const urlSearchParams = new URLSearchParams(queryString);
const queryParams: Record<string, string> = {};
urlSearchParams.forEach((value, key) => {
queryParams[key] = value;
});
const methods =
typeof queryParams.methods === "string" ? queryParams.methods.split(",") : undefined;
const result = {
Expand Down Expand Up @@ -69,15 +72,25 @@ export function formatRelayParams(relay: RelayerTypes.ProtocolOptions, delimiter
}

export function formatUri(params: EngineTypes.UriParameters): string {
return (
`${params.protocol}:${params.topic}@${params.version}?` +
qs.stringify({
symKey: params.symKey,
...formatRelayParams(params.relay),
expiryTimestamp: params.expiryTimestamp,
...(params.methods ? { methods: params.methods.join(",") } : {}),
})
);
const urlSearchParams = new URLSearchParams();

const relayParams = formatRelayParams(params.relay);
Object.keys(relayParams)
.sort()
.forEach((key) => {
urlSearchParams.set(key, relayParams[key]);
});

urlSearchParams.set("symKey", params.symKey);
if (params.expiryTimestamp)
urlSearchParams.set("expiryTimestamp", params.expiryTimestamp.toString());

if (params.methods) {
urlSearchParams.set("methods", params.methods.join(","));
}

const queryString = urlSearchParams.toString();
return `${params.protocol}:${params.topic}@${params.version}?${queryString}`;
}

export function getLinkModeURL(
Expand Down
Loading