Skip to content

feat: remove force update #93

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.

Sign up for GitHub

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

Merged
jonasXchen merged 1 commit into from
Dec 3, 2025
Merged

feat: remove force update #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 4 additions & 64 deletions ts/kit/src/access-control/permission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export interface PermissionStatusResponse {
*/
export async function getPermissionStatus(
rpcUrl: string,
publicKey: Address,
publicKey: Address
): Promise<PermissionStatusResponse> {
// Build the route from the provided RPC URL
// Handle the provided token
Expand All @@ -28,52 +28,16 @@ export async function getPermissionStatus(
const permissionStatusResponse = await fetch(url);
if (!permissionStatusResponse.ok) {
throw new Error(
`Permission status request failed: ${permissionStatusResponse.statusText}`,
`Permission status request failed: ${permissionStatusResponse.statusText}`
);
}
const response: PermissionStatusResponse =
await permissionStatusResponse.json();
return response;
} catch (error) {
throw new Error(
`Failed to get permission status: ${error instanceof Error ? error.message : String(error)}`,
);
}
}

/**
* Force update permissions for a given public key
* @param rpcUrl - The URL of the RPC server
* @param publicKey - The public key of the user
* @returns True if the force update was successful, false otherwise
*/
async function forcePermissionUpdate(
rpcUrl: string,
publicKey: Address,
): Promise<boolean> {
// Build the route from the provided RPC URL
// Handle the provided token
const [baseUrl, token] = rpcUrl.replace("/?", "?").split("?");
let url;
if (token) {
url = `${baseUrl}/permission/force-update?${token}&pubkey=${publicKey.toString()}`;
} else {
url = `${baseUrl}/permission/force-update?pubkey=${publicKey.toString()}`;
}

try {
const forceUpdateResponse = await fetch(url);
if (!forceUpdateResponse.ok) {
throw new Error(
`Force permission update request failed: ${forceUpdateResponse.statusText}`,
);
}
return true;
} catch (error) {
console.error(
`Failed to force permission update: ${error instanceof Error ? error.message : String(error)}`,
`Failed to get permission status: ${error instanceof Error ? error.message : String(error)}`
);
return false;
}
}

Expand All @@ -87,7 +51,7 @@ async function forcePermissionUpdate(
export async function waitUntilPermissionActive(
rpcUrl: string,
publicKey: Address,
timeout?: number,
timeout?: number
): Promise<boolean> {
const timeoutMs = timeout ?? 5000;

Expand All @@ -108,29 +72,5 @@ export async function waitUntilPermissionActive(
});
}

// If timeout reached, try force permission update as fallback
const forceUpdateSuccess = await forcePermissionUpdate(rpcUrl, publicKey);
if (forceUpdateSuccess) {
// Retry permission status for another 5 seconds after force update
startTime = Date.now();
while (Date.now() - startTime < timeoutMs) {
try {
const { authorizedUsers } = await getPermissionStatus(
rpcUrl,
publicKey,
);
if (authorizedUsers && authorizedUsers.length > 0) {
return true;
}
} catch (error) {
console.error(error);
}

await new Promise((resolve) => {
setTimeout(resolve, 400);
});
}
}

return false;
}
68 changes: 4 additions & 64 deletions ts/web3js/src/access-control/permission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export interface PermissionStatusResponse {
*/
export async function getPermissionStatus(
rpcUrl: string,
publicKey: PublicKey,
publicKey: PublicKey
): Promise<PermissionStatusResponse> {
// Build the route from the provided RPC URL
// Handle the provided token
Expand All @@ -28,52 +28,16 @@ export async function getPermissionStatus(
const permissionStatusResponse = await fetch(url);
if (!permissionStatusResponse.ok) {
throw new Error(
`Permission status request failed: ${permissionStatusResponse.statusText}`,
`Permission status request failed: ${permissionStatusResponse.statusText}`
);
}
const response: PermissionStatusResponse =
await permissionStatusResponse.json();
return response;
} catch (error) {
throw new Error(
`Failed to get permission status: ${error instanceof Error ? error.message : String(error)}`,
);
}
}

/**
* Force update permissions for a given public key
* @param rpcUrl - The URL of the RPC server
* @param publicKey - The public key of the user
* @returns True if the force update was successful, false otherwise
*/
async function forcePermissionUpdate(
rpcUrl: string,
publicKey: PublicKey,
): Promise<boolean> {
// Build the route from the provided RPC URL
// Handle the provided token
const [baseUrl, token] = rpcUrl.replace("/?", "?").split("?");
let url;
if (token) {
url = `${baseUrl}/permission/force-update?${token}&pubkey=${publicKey.toString()}`;
} else {
url = `${baseUrl}/permission/force-update?pubkey=${publicKey.toString()}`;
}

try {
const forceUpdateResponse = await fetch(url);
if (!forceUpdateResponse.ok) {
throw new Error(
`Force permission update request failed: ${forceUpdateResponse.statusText}`,
);
}
return true;
} catch (error) {
console.error(
`Failed to force permission update: ${error instanceof Error ? error.message : String(error)}`,
`Failed to get permission status: ${error instanceof Error ? error.message : String(error)}`
);
return false;
}
}

Expand All @@ -87,7 +51,7 @@ async function forcePermissionUpdate(
export async function waitUntilPermissionActive(
rpcUrl: string,
publicKey: PublicKey,
timeout?: number,
timeout?: number
): Promise<boolean> {
const timeoutMs = timeout ?? 5000;

Expand All @@ -108,29 +72,5 @@ export async function waitUntilPermissionActive(
});
}

// If timeout reached, try force permission update as fallback
const forceUpdateSuccess = await forcePermissionUpdate(rpcUrl, publicKey);
if (forceUpdateSuccess) {
// Retry permission status for another 5 seconds after force update
startTime = Date.now();
while (Date.now() - startTime < timeoutMs) {
try {
const { authorizedUsers } = await getPermissionStatus(
rpcUrl,
publicKey,
);
if (authorizedUsers && authorizedUsers.length > 0) {
return true;
}
} catch (error) {
console.error(error);
}

await new Promise((resolve) => {
setTimeout(resolve, 400);
});
}
}

return false;
}