You've already forked AstralRinth
* update add files copy and go to next step on just one file * rename and reorder stages * add metadata stage and update details stage * implement files inside metadata stage * use regular prettier instead of prettier eslint * remove changelog stage config * save button on details stage * update edit buttons in versions table * add collapse environment selector * implement dependencies list in metadata step * move dependencies into provider * add suggested dependencies to metadata stage * pnpm prepr * fix unused var * Revert "add collapse environment selector" This reverts commit f90fabc7a57ff201f26e1b628eeced8e6ef75865. * hide resource pack loader only when its the only loader * fix no dependencies for modpack * add breadcrumbs with hide breadcrumb option * wider stages * add proper horizonal scroll breadcrumbs * fix titles * handle save version in version page * remove box shadow * add notification provider to storybook * add drop area for versions to drop file right into page * fix mobile versions table buttons overflowing * pnpm prepr * fix drop file opening modal in wrong stage * implement invalid file for dropping files * allow horizontal scroll on breadcrumbs * update infer.js as best as possible * add create version button uploading version state * add extractVersionFromFilename for resource pack and datapack * allow jars for datapack project * detect multiple loaders when possible * iris means compatible with optifine too * infer environment on loader change as well * add tooltip * prevent navigate forward when cannot go to next step * larger breadcrumb click targets * hide loaders and mc versions stage until files added * fix max width in header * fix add files from metadata step jumping steps * define width in NewModal instead * disable remove dependency in metadata stage * switch metadata and details buttons positions * fix remove button spacing * do not allow duplicate suggested dependencies * fix version detection for fabric minecraft version semvar * better verion number detection based on filename * show resource pack loader but uneditable * remove vanilla shader detection * refactor: break up large infer.js into ts and modules * remove duplicated types * add fill missing from file name step * pnpm prepr * fix neoforge loader parse failing and not adding neoforge loader * add missing pack formats * handle new pack format * pnpm prepr * add another regex where it is version in anywhere in filename * only show resource pack or data pack options for filetype on datapack project * add redundant zip folder check * reject RP and DP if has redundant folder * fix hide stage in breadcrumb * add snapshot group key in case no release version. brings out 26.1 snapshots * pnpm prepr * open in group if has something selected * fix resource pack loader uneditable if accidentally selected on different project type * add new environment tags * add unknown and not applicable environment tags * pnpm prepr * use shared constant on labels * use ref for timeout * remove console logs * remove box shadow only for cm-content * feat: xhr upload + fix wrangler prettierignore * fix: upload content type fix * fix dependencies version width * fix already added dependencies logic * add changelog minheight * set progress percentage on button * add legacy fabric detection logic * lint * small update on create version button label --------- Co-authored-by: Calum H. (IMB11) <contact@cal.engineer> Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
155 lines
4.7 KiB
TypeScript
155 lines
4.7 KiB
TypeScript
import { AbstractModrinthClient } from '../core/abstract-client'
|
|
import { ModrinthApiError } from '../core/errors'
|
|
import type { RequestContext } from '../types/request'
|
|
import type {
|
|
UploadHandle,
|
|
UploadMetadata,
|
|
UploadProgress,
|
|
UploadRequestOptions,
|
|
} from '../types/upload'
|
|
|
|
/**
|
|
* Abstract client with XHR-based upload implementation
|
|
*
|
|
* Platform-specific clients should extend this instead of AbstractModrinthClient
|
|
* to inherit the XHR upload implementation.
|
|
*/
|
|
export abstract class XHRUploadClient extends AbstractModrinthClient {
|
|
upload<T = void>(path: string, options: UploadRequestOptions): UploadHandle<T> {
|
|
let baseUrl: string
|
|
if (options.api === 'labrinth') {
|
|
baseUrl = this.config.labrinthBaseUrl!
|
|
} else if (options.api === 'archon') {
|
|
baseUrl = this.config.archonBaseUrl!
|
|
} else {
|
|
baseUrl = options.api
|
|
}
|
|
|
|
const url = this.buildUrl(path, baseUrl, options.version)
|
|
|
|
// For FormData uploads, don't set Content-Type (let browser set multipart boundary)
|
|
// For file uploads, use application/octet-stream
|
|
const isFormData = 'formData' in options && options.formData instanceof FormData
|
|
const baseHeaders = this.buildDefaultHeaders()
|
|
// Remove Content-Type for FormData so browser can set multipart/form-data with boundary
|
|
if (isFormData) {
|
|
delete baseHeaders['Content-Type']
|
|
} else {
|
|
baseHeaders['Content-Type'] = 'application/octet-stream'
|
|
}
|
|
|
|
const mergedOptions: UploadRequestOptions = {
|
|
retry: false, // default: don't retry uploads
|
|
...options,
|
|
headers: {
|
|
...baseHeaders,
|
|
...options.headers,
|
|
},
|
|
}
|
|
|
|
const context = this.buildUploadContext(url, path, mergedOptions)
|
|
|
|
const progressCallbacks: Array<(p: UploadProgress) => void> = []
|
|
if (mergedOptions.onProgress) {
|
|
progressCallbacks.push(mergedOptions.onProgress)
|
|
}
|
|
const abortController = new AbortController()
|
|
|
|
if (mergedOptions.signal) {
|
|
mergedOptions.signal.addEventListener('abort', () => abortController.abort())
|
|
}
|
|
|
|
const handle: UploadHandle<T> = {
|
|
promise: this.executeUploadFeatureChain<T>(context, progressCallbacks, abortController)
|
|
.then(async (result) => {
|
|
await this.config.hooks?.onResponse?.(result, context)
|
|
return result
|
|
})
|
|
.catch(async (error) => {
|
|
const apiError = this.normalizeError(error, context)
|
|
await this.config.hooks?.onError?.(apiError, context)
|
|
throw apiError
|
|
}),
|
|
onProgress: (callback) => {
|
|
progressCallbacks.push(callback)
|
|
return handle
|
|
},
|
|
cancel: () => abortController.abort(),
|
|
}
|
|
|
|
return handle
|
|
}
|
|
|
|
protected executeXHRUpload<T>(
|
|
context: RequestContext,
|
|
progressCallbacks: Array<(p: UploadProgress) => void>,
|
|
abortController: AbortController,
|
|
): Promise<T> {
|
|
return new Promise<T>((resolve, reject) => {
|
|
const xhr = new XMLHttpRequest()
|
|
const metadata = context.metadata as UploadMetadata
|
|
|
|
xhr.upload.addEventListener('progress', (e) => {
|
|
if (e.lengthComputable) {
|
|
const progress: UploadProgress = {
|
|
loaded: e.loaded,
|
|
total: e.total,
|
|
progress: e.loaded / e.total,
|
|
}
|
|
progressCallbacks.forEach((cb) => cb(progress))
|
|
}
|
|
})
|
|
|
|
xhr.addEventListener('load', () => {
|
|
if (xhr.status >= 200 && xhr.status < 300) {
|
|
try {
|
|
resolve(xhr.response ? JSON.parse(xhr.response) : (undefined as T))
|
|
} catch {
|
|
resolve(undefined as T)
|
|
}
|
|
} else {
|
|
reject(this.createUploadError(xhr))
|
|
}
|
|
})
|
|
|
|
xhr.addEventListener('error', () => reject(new ModrinthApiError('Upload failed')))
|
|
xhr.addEventListener('abort', () => reject(new ModrinthApiError('Upload cancelled')))
|
|
|
|
// build URL with params (unlike $fetch, XHR doesn't handle params automatically)
|
|
let url = context.url
|
|
if (context.options.params) {
|
|
const queryString = new URLSearchParams(
|
|
Object.entries(context.options.params).map(([k, v]) => [k, String(v)]),
|
|
).toString()
|
|
url += (url.includes('?') ? '&' : '?') + queryString
|
|
}
|
|
|
|
xhr.open('POST', url)
|
|
|
|
// apply headers from context (features may have modified them)
|
|
for (const [key, value] of Object.entries(context.options.headers ?? {})) {
|
|
xhr.setRequestHeader(key, value)
|
|
}
|
|
|
|
// Send either FormData or file depending on what was provided
|
|
const data = 'formData' in metadata ? metadata.formData : metadata.file
|
|
xhr.send(data)
|
|
abortController.signal.addEventListener('abort', () => xhr.abort())
|
|
})
|
|
}
|
|
|
|
protected createUploadError(xhr: XMLHttpRequest): ModrinthApiError {
|
|
let responseData: unknown
|
|
try {
|
|
responseData = xhr.response ? JSON.parse(xhr.response) : undefined
|
|
} catch {
|
|
responseData = xhr.responseText
|
|
}
|
|
return this.createNormalizedError(
|
|
new Error(`Upload failed with status ${xhr.status}`),
|
|
xhr.status,
|
|
responseData,
|
|
)
|
|
}
|
|
}
|