mirror of
https://github.com/modrinth/code.git
synced 2026-08-30 19:46:33 +00:00
* refactor: remove unused legacy onboarded flag * sqlx prepare * feat: add onboarding checklist app db and add vue provider * feat: add welcome page * feat: add onboarding checklist component * feat: move checklist visibility source of truth in app db * feat: split up import modpack button * feat-small: style tweak * feat: remove discover section from homepage and add library * refactor: move welcome screen to component * refactor: move grid display into /library * refactor: rename existing components * refactor: split up the current library page files * feat: add create group modal * feat: add instance group definitions * feat: update accordian for instance groups * feat: add delete group * feat: implement rename instance groups * refactor: move instance group api out * feat: add context menu for groups * feat: style instance items in library * feat: add selected instance item state * feat: implement action bar for selection * feat: drag and drop to move between groups * feat: show ungrouped with header * feat: improve edit group name * small fix * small style fixes * feat: improve selection behaviour * fix: dont toggle group when context menu open * feat: drag and drop multiple selected * small * feat: add remove from group in action bar * feat: add delay on icon hiding in inline input * feat: improve icon hiding delay * fix: bad routes.js * feat: implement sort and filter options * refactor: dont prefix filenames * feat: change open/collapse group target * feat: improve ungrouped behaviour * feat: add shift to select multiple instances * fix: icon disappear transition * feat: add esc while dragging to cancel * feat: update sorting and moved label * feat: update context menu * fix: multiple context menus can be opened * refactor: instance groups to be identified by ID instead of name, names become display data * feat: creating new group always adds instance * feat: create group button, fix instance selection, and increase group name max length * feat: strokes * fix: show getting started checklist in all sidebar * feat: set size on microsoft login screen * fix: use ButtonStyled in Chips component * feat: creating groups with selected instances and fix some moving selection and duplication bugs * pnpm prepr * feat: add tooltip for instance already in group * feat: create instance with content in creation flow modal - search modpack becomes search projects - creation flow modal context receives prepareProjectInstall and createProjectInstall callbacks, from content-install.ts (shared with ContentInstallModal) * feat: update instance card styles * refactor: separate out instance card content * update styles * refactor: instance card * fix: width of instance * feat: update empty state * feat: update sort and grouping dropdowns * feat: better context menu options * feat: add group action buttons * feat: add/remove favourites group * remove manual sort * feat: improve the "New group" jank * feat: add group by instance type and change group sorting * feat: welcome screen styles match figma * feat: not signed in skins demo * feat: new hosting empty state * feat: new instance card style * feat: add tooltip and spice up animation more * feat: improve the transitions for groups after dropping many instances * feat: set instance group membership for bulk moving * feat: remove fade out * fix: allow dragging from buttons inside instance card * fix: library page load in behaviour * small fix * feat: add group ordering and reordering * feat: add drag to reorder groups * fix: switching page not clearing selected instances * style fixes * style fix * fix spacing * feat: jump in changes * feat: add styled newly created instances * feat: improve jump in cards styles * fix: welcome screen style * fix: empty state styles * feat: max 5 jump in items * feat: max new instances to 3 * fix: search icon * feat: clear selection after move * feat: skins list use check icon styles * feat: list will be deleted instances and default sort last played * fix: stroke * remove: no more group settings in instance general settings * fix: resolving modpack server install * feat: icon editor * feat: add three hue shifted variants * fix: surprise me doesnt pick symbol * feat: add customize icon to create instance modal * feat: skins loading state style * fix: welcome logo * fix: copy * fix: left over usage of ButtonStyled from main's refactor * feat: some leaked merge stuff * feat: server empty state styles * remove: instance helper text * remove: auto link in set up stage * feat: auto focus on search when modal open * fix: delete instance modal style * remove: modpack meta repeating * fix: icon * fix: font weight * fix: dropdown filter preview heights * pnpm prepr * fix: sign into modrinth flashing change in position * feat: add avatar transparent corner gets padding * feat: drag and hold over group opens group * feat: add random icon for custom instance * feat: update loading icon * polish: empty state for search * polish: jump in cards * fix: avatar could skip checking for image if tauri loads it first * feat: add icon customize and randomizer in content install modal for add to new instances * fix: avatar cannot read image pixels due to cors * refactor: popup notifications toast type for instance sharing notifications * feat: apply random icons modal and add popup notification for it * polish: style * fix: set_webview_visible * QA * qa * feat: add inner white 15 opacity stroke around avatar * add to catalog * pnpm prepr * fix: app event import * feat: add new icons and backgrounds for icon editor * feat: recents list generate from randomized icons and save icon in editor + icon editor modal fixes * qa * refactor: recipe -> config * fix: event bus * polish * feat: add safe guard against randomizing empty icons * feat: navigate to instance after creation * fix: icon file names * i18n on welcome screen * i18n pass on PR * fix: inconsistent max group name length * refactor: use sqlx macro * feat: add instance icon background selection drag * feat: update catalog order * fix: remove gradient for welcome screen * remove: frog * fix: min width * feat: update corner size * fix: context menu styles * prepr * fix: instance name trimming * reorder * fix: instance card loading state stayed until hovering * feat: add icon randomizer blacklist * blog * prepr --------- Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
350 lines
9.5 KiB
TypeScript
350 lines
9.5 KiB
TypeScript
import { invoke } from '@tauri-apps/api/core'
|
|
|
|
import type { InstallErrorView } from '@/generated/app-events/InstallErrorView'
|
|
import type { InstallJavaStep } from '@/generated/app-events/InstallJavaStep'
|
|
import type { InstallJobSnapshot } from '@/generated/app-events/InstallJobSnapshot'
|
|
import type { InstallJobStatus } from '@/generated/app-events/InstallJobStatus'
|
|
import type { InstallPhaseId } from '@/generated/app-events/InstallPhaseId'
|
|
import type { InstallProgress } from '@/generated/app-events/InstallProgress'
|
|
import type { InstallProgressSecondary } from '@/generated/app-events/InstallProgressSecondary'
|
|
import type { SharedInstanceUnavailableReason } from '@/generated/app-events/SharedInstanceUnavailableReason'
|
|
import type { AppEvents } from '@/providers/app-events'
|
|
|
|
import type { InstanceIconConfig, InstanceLink, InstanceLoader } from './types'
|
|
|
|
export type {
|
|
InstallErrorView,
|
|
InstallJavaStep,
|
|
InstallJobSnapshot,
|
|
InstallJobStatus,
|
|
InstallPhaseId,
|
|
InstallProgress,
|
|
InstallProgressSecondary,
|
|
SharedInstanceUnavailableReason,
|
|
}
|
|
|
|
export interface PackLocationVersionId {
|
|
type: 'fromVersionId'
|
|
project_id: string
|
|
version_id: string
|
|
title: string
|
|
icon_url?: string | null
|
|
}
|
|
|
|
export interface PackLocationFile {
|
|
type: 'fromFile'
|
|
path: string
|
|
}
|
|
|
|
export type CreatePackLocation = PackLocationVersionId | PackLocationFile
|
|
|
|
export interface InstallModpackPreview {
|
|
name: string
|
|
gameVersion: string
|
|
modloader: InstanceLoader
|
|
loaderVersion: string | null
|
|
icon?: string | null
|
|
iconUrl?: string | null
|
|
link?: InstanceLink | null
|
|
unknownFile: boolean
|
|
externalFilesInModpack: string[]
|
|
}
|
|
|
|
export interface InstallCreateInstanceRequest {
|
|
name: string
|
|
gameVersion: string
|
|
loader: InstanceLoader
|
|
loaderVersion: string | null
|
|
iconPath: string | null
|
|
iconConfig?: InstanceIconConfig | null
|
|
link?: InstanceLink | null
|
|
}
|
|
|
|
export interface InstallPostInstallEdit {
|
|
name?: string | null
|
|
iconPath?: string | null
|
|
link?: InstanceLink | null
|
|
}
|
|
|
|
export interface SharedInstanceInstallPreview {
|
|
sharedInstanceId: string
|
|
version: number
|
|
name: string
|
|
iconUrl?: string | null
|
|
gameVersion: string
|
|
loader: InstanceLoader
|
|
modCount: number
|
|
externalFileCount: number
|
|
modpackVersionId?: string | null
|
|
contentVersionIds: string[]
|
|
externalFiles: SharedInstanceExternalFilePreview[]
|
|
}
|
|
|
|
export interface SharedInstanceInviteInstallPreview {
|
|
sharedInstanceId: string
|
|
managerId?: string | null
|
|
serverManagerName?: string | null
|
|
serverManagerIconUrl?: string | null
|
|
instanceIconUrl?: string | null
|
|
preview: SharedInstanceInstallPreview
|
|
}
|
|
|
|
export interface SharedInstanceExternalFilePreview {
|
|
fileName: string
|
|
fileType: string
|
|
}
|
|
|
|
export interface SharedInstanceUpdatePreview {
|
|
sharedInstanceId: string
|
|
currentVersion?: number | null
|
|
latestVersion: number
|
|
updateAvailable: boolean
|
|
diffs: SharedInstanceUpdateDiff[]
|
|
}
|
|
|
|
export interface SharedInstanceUpdateDiff {
|
|
type:
|
|
| 'added'
|
|
| 'removed'
|
|
| 'updated'
|
|
| 'modpack_linked'
|
|
| 'modpack_updated'
|
|
| 'modpack_unlinked'
|
|
| 'game_version_updated'
|
|
| 'loader_updated'
|
|
| 'config_files_updated'
|
|
projectId?: string | null
|
|
projectName?: string | null
|
|
fileName?: string | null
|
|
currentVersionName?: string | null
|
|
newVersionName?: string | null
|
|
configFileCount?: number | null
|
|
disabled?: boolean
|
|
}
|
|
|
|
export const SHARED_INSTANCE_UNAVAILABLE_ERROR_CODE = 'shared_instance_unavailable'
|
|
export const SHARED_INSTANCES_API_ERROR_CODE = 'shared_instances_api_error'
|
|
|
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
return typeof value === 'object' && value !== null
|
|
}
|
|
|
|
export function isSharedInstanceUnavailableError(error: unknown) {
|
|
return getSharedInstanceUnavailableReason(error) !== null
|
|
}
|
|
|
|
export function isSharedInstancesApiError(error: unknown) {
|
|
return isRecord(error) && error.code === SHARED_INSTANCES_API_ERROR_CODE
|
|
}
|
|
|
|
export function getSharedInstanceUnavailableReason(
|
|
error: unknown,
|
|
): SharedInstanceUnavailableReason | null {
|
|
if (!isRecord(error) || error.code !== SHARED_INSTANCE_UNAVAILABLE_ERROR_CODE) return null
|
|
return error.reason === 'deleted' ||
|
|
error.reason === 'access_revoked' ||
|
|
error.reason === 'quarantined'
|
|
? error.reason
|
|
: null
|
|
}
|
|
|
|
export function getErrorMessage(error: unknown): string {
|
|
if (typeof error === 'string') return error
|
|
if (error instanceof Error) return error.message || 'Unknown error'
|
|
if (isRecord(error) && typeof error.message === 'string') return error.message
|
|
return 'Unknown error'
|
|
}
|
|
|
|
export async function install_get_modpack_preview(location: CreatePackLocation) {
|
|
return await invoke<InstallModpackPreview>('plugin:install|install_get_modpack_preview', {
|
|
location,
|
|
})
|
|
}
|
|
|
|
export async function install_create_instance(request: InstallCreateInstanceRequest) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_create_instance', { request })
|
|
}
|
|
|
|
export async function install_create_modpack_instance(
|
|
location: CreatePackLocation,
|
|
postInstallEdit?: InstallPostInstallEdit | null,
|
|
) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_create_modpack_instance', {
|
|
location,
|
|
postInstallEdit,
|
|
})
|
|
}
|
|
|
|
export async function install_get_shared_instance_preview(sharedInstanceId: string, name: string) {
|
|
return await invoke<SharedInstanceInstallPreview>(
|
|
'plugin:install|install_get_shared_instance_preview',
|
|
{
|
|
sharedInstanceId,
|
|
name,
|
|
},
|
|
)
|
|
}
|
|
|
|
export async function install_accept_shared_instance_invite(inviteId: string) {
|
|
return await invoke<SharedInstanceInviteInstallPreview>(
|
|
'plugin:install|install_accept_shared_instance_invite',
|
|
{
|
|
inviteId,
|
|
},
|
|
)
|
|
}
|
|
|
|
export async function install_get_shared_instance_update_preview(instanceId: string) {
|
|
return await invoke<SharedInstanceUpdatePreview | null>(
|
|
'plugin:install|install_get_shared_instance_update_preview',
|
|
{
|
|
instanceId,
|
|
},
|
|
)
|
|
}
|
|
|
|
export async function install_shared_instance(
|
|
sharedInstanceId: string,
|
|
name: string,
|
|
managerId?: string | null,
|
|
serverManagerName?: string | null,
|
|
serverManagerIconUrl?: string | null,
|
|
instanceIconUrl?: string | null,
|
|
) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_shared_instance', {
|
|
sharedInstanceId,
|
|
name,
|
|
managerId,
|
|
serverManagerName,
|
|
serverManagerIconUrl,
|
|
instanceIconUrl,
|
|
})
|
|
}
|
|
|
|
export async function install_update_shared_instance(instanceId: string) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_update_shared_instance', {
|
|
instanceId,
|
|
})
|
|
}
|
|
|
|
export async function install_import_instance(
|
|
launcherType: string,
|
|
basePath: string,
|
|
instanceFolder: string,
|
|
) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_import_instance', {
|
|
launcherType,
|
|
basePath,
|
|
instanceFolder,
|
|
})
|
|
}
|
|
|
|
export async function install_duplicate_instance(sourceInstanceId: string) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_duplicate_instance', {
|
|
sourceInstanceId,
|
|
})
|
|
}
|
|
|
|
export async function install_existing_instance(instanceId: string, force: boolean) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_existing_instance', {
|
|
instanceId,
|
|
force,
|
|
})
|
|
}
|
|
|
|
export async function install_pack_to_existing_instance(
|
|
instanceId: string,
|
|
location: CreatePackLocation,
|
|
postInstallEdit?: InstallPostInstallEdit | null,
|
|
) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_pack_to_existing_instance', {
|
|
instanceId,
|
|
location,
|
|
postInstallEdit,
|
|
})
|
|
}
|
|
|
|
export async function install_job_list(includeFinished: boolean) {
|
|
return await invoke<InstallJobSnapshot[]>('plugin:install|install_job_list', { includeFinished })
|
|
}
|
|
|
|
export async function install_job_get(jobId: string) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_job_get', { jobId })
|
|
}
|
|
|
|
export async function install_job_retry(jobId: string) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_job_retry', { jobId })
|
|
}
|
|
|
|
export async function install_job_cancel(jobId: string) {
|
|
return await invoke<InstallJobSnapshot>('plugin:install|install_job_cancel', { jobId })
|
|
}
|
|
|
|
export async function install_job_dismiss(jobId: string) {
|
|
return await invoke<void>('plugin:install|install_job_dismiss', { jobId })
|
|
}
|
|
|
|
export async function install_job_support_details(jobId: string) {
|
|
return await invoke<string>('plugin:install|install_job_support_details', { jobId })
|
|
}
|
|
|
|
export function installJobInstanceId(job: InstallJobSnapshot): string | null {
|
|
return job.instance_id ?? job.target.instance_id ?? null
|
|
}
|
|
|
|
export function isInstallJobFinished(status: InstallJobStatus) {
|
|
return (
|
|
status === 'succeeded' ||
|
|
status === 'failed' ||
|
|
status === 'interrupted' ||
|
|
status === 'canceled'
|
|
)
|
|
}
|
|
|
|
function settleInstallJob(job: InstallJobSnapshot) {
|
|
if (job.status === 'succeeded') return job
|
|
|
|
if (job.error) throw job.error
|
|
throw new Error(`Install job ${job.job_id} ${job.status}`)
|
|
}
|
|
|
|
export async function wait_for_install_job(events: AppEvents, jobId: string) {
|
|
const current = await install_job_get(jobId)
|
|
if (isInstallJobFinished(current.status)) return settleInstallJob(current)
|
|
|
|
return await new Promise<InstallJobSnapshot>((resolve, reject) => {
|
|
let finished = false
|
|
let unlisten: (() => void) | null = null
|
|
|
|
const cleanup = () => {
|
|
if (unlisten) {
|
|
unlisten()
|
|
unlisten = null
|
|
}
|
|
}
|
|
|
|
const resolveJob = (job: InstallJobSnapshot) => {
|
|
if (finished || job.job_id !== jobId || !isInstallJobFinished(job.status)) return
|
|
|
|
finished = true
|
|
cleanup()
|
|
|
|
try {
|
|
resolve(settleInstallJob(job))
|
|
} catch (err) {
|
|
reject(err)
|
|
}
|
|
}
|
|
|
|
const rejectWait = (err: unknown) => {
|
|
if (finished) return
|
|
finished = true
|
|
cleanup()
|
|
reject(err)
|
|
}
|
|
|
|
unlisten = events.on('install_job', resolveJob)
|
|
install_job_get(jobId).then(resolveJob).catch(rejectWait)
|
|
})
|
|
}
|