Skip to content

Fix assets TypeScript SDK v2 URLs #6

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

Closed
johnpyp wants to merge 1 commit into from
Closed

Fix assets TypeScript SDK v2 URLs #6

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
28 changes: 27 additions & 1 deletion typescript/assets-api/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,35 @@ export const toPathString = function (url: URL) {
return url.pathname + url.search + url.hash
}

const ASSETS_API_BASE_PATH = "https://assets.deadlock-api.com";
const CANONICAL_VERSIONED_ASSETS_API_BASE_PATH = "https://api.deadlock-api.com/v1/assets";

function normalizeBasePath(basePath?: string) {
return (basePath ?? "").replace(/\/+$/, "");
}

function createRequestUrl(axios: AxiosInstance, requestPath: string, configuredBasePath: string) {
const axiosBasePath = typeof axios.defaults.baseURL === "string" ? normalizeBasePath(axios.defaults.baseURL) : "";
const normalizedConfiguredBasePath = normalizeBasePath(configuredBasePath);
const effectiveBasePath = axiosBasePath || normalizedConfiguredBasePath;

if (requestPath.startsWith("/v2/")) {
const canonicalPath = requestPath.slice("/v2".length);
if (effectiveBasePath === ASSETS_API_BASE_PATH) {
return `${CANONICAL_VERSIONED_ASSETS_API_BASE_PATH}${canonicalPath}`;
}
if (effectiveBasePath === CANONICAL_VERSIONED_ASSETS_API_BASE_PATH) {
return axiosBasePath ? canonicalPath : `${normalizedConfiguredBasePath}${canonicalPath}`;
}
}

return `${axiosBasePath ? "" : configuredBasePath}${requestPath}`;
}

export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (axios.defaults.baseURL ? '' : configuration?.basePath ?? basePath) + axiosArgs.url};
const configuredBasePath = configuration?.basePath ?? basePath;
const axiosRequestArgs = {...axiosArgs.options, url: createRequestUrl(axios, axiosArgs.url, configuredBasePath)};
return axios.request<T, R>(axiosRequestArgs);
};
}
54 changes: 54 additions & 0 deletions typescript/patch.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,59 @@ function addJsExtensions(dir) {
}
}

function patchAssetsApiClient(dir, pkg) {
if (pkg.name !== "assets_deadlock_api_client") return;

const commonPath = resolve(dir, "common.ts");
const common = readFileSync(commonPath, "utf8");
if (common.includes("CANONICAL_VERSIONED_ASSETS_API_BASE_PATH")) return;

const original = `export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs = {...axiosArgs.options, url: (axios.defaults.baseURL ? '' : configuration?.basePath ?? basePath) + axiosArgs.url};
return axios.request<T, R>(axiosRequestArgs);
};
}`;
const replacement = `const ASSETS_API_BASE_PATH = "https://assets.deadlock-api.com";
const CANONICAL_VERSIONED_ASSETS_API_BASE_PATH = "https://api.deadlock-api.com/v1/assets";

function normalizeBasePath(basePath?: string) {
return (basePath ?? "").replace(/\\/+$/, "");
}

function createRequestUrl(axios: AxiosInstance, requestPath: string, configuredBasePath: string) {
const axiosBasePath = typeof axios.defaults.baseURL === "string" ? normalizeBasePath(axios.defaults.baseURL) : "";
const normalizedConfiguredBasePath = normalizeBasePath(configuredBasePath);
const effectiveBasePath = axiosBasePath || normalizedConfiguredBasePath;

if (requestPath.startsWith("/v2/")) {
const canonicalPath = requestPath.slice("/v2".length);
if (effectiveBasePath === ASSETS_API_BASE_PATH) {
return \`\${CANONICAL_VERSIONED_ASSETS_API_BASE_PATH}\${canonicalPath}\`;
}
if (effectiveBasePath === CANONICAL_VERSIONED_ASSETS_API_BASE_PATH) {
return axiosBasePath ? canonicalPath : \`\${normalizedConfiguredBasePath}\${canonicalPath}\`;
}
}

return \`\${axiosBasePath ? "" : configuredBasePath}\${requestPath}\`;
}

export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const configuredBasePath = configuration?.basePath ?? basePath;
const axiosRequestArgs = {...axiosArgs.options, url: createRequestUrl(axios, axiosArgs.url, configuredBasePath)};
return axios.request<T, R>(axiosRequestArgs);
};
}`;

if (!common.includes(original)) {
throw new Error(`Could not find createRequestFunction in ${commonPath}`);
}

writeFileSync(commonPath, common.replace(original, replacement));
}

const dir = process.argv[2];
if (!dir) {
console.error("usage: patch.mjs <client-dir>");
Expand Down Expand Up @@ -88,6 +141,7 @@ const tsconfig = {
writeFileSync(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}\n`);
rmSync(tsconfigEsmPath, { force: true });

patchAssetsApiClient(dir, pkg);
addJsExtensions(dir);

console.log(`patched ${dir}`);
Loading