Skip to content

Commit b0bc963

Browse files
dreamguxiangdreamguxiang
committed
refactor: remove importserver module
1 parent 0fe80b1 commit b0bc963

File tree

4 files changed

+78
-641
lines changed

4 files changed

+78
-641
lines changed

‎frontend/src/pages/ContentPage.tsx‎

Lines changed: 55 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -157,62 +157,36 @@ export default function ContentPage() {
157157
const sp = `${roots.usersRoot}\\${player}\\games\\com.mojang\\skin_packs`;
158158
setSkinCount(await countDirectories(sp));
159159
};
160-
const [importServer, setImportServer] = React.useState<string>("");
161-
React.useEffect(() => {
162-
(async () => {
163-
try {
164-
const url = await (minecraft as any)?.GetImportServerURL?.();
165-
const u = String(url || "");
166-
setImportServer(u || "http://127.0.0.1:32773");
167-
} catch {
168-
setImportServer("http://127.0.0.1:32773");
169-
}
170-
})();
171-
}, []);
172160
const postImportMcpack = async (
173161
name: string,
174162
file: File,
175163
overwrite: boolean
176164
): Promise<string> => {
177165
try {
178-
const fd = new FormData();
179-
fd.append("name", name);
180-
fd.append("overwrite", overwrite ? "1" : "0");
181-
if (selectedPlayer) fd.append("player", selectedPlayer);
182-
fd.append("file", file, file.name);
183-
const resp = await fetch(
184-
`${importServer || "http://127.0.0.1:32773"}/api/import/mcpack`,
185-
{ method: "POST", body: fd }
186-
);
187-
const j = (await resp.json().catch(() => ({}))) as any;
188-
return String(j?.error || "");
189-
} catch (e: any) {
190-
try {
191-
const buf = await file.arrayBuffer();
192-
const bytes = Array.from(new Uint8Array(buf));
193-
let err = "";
194-
if (
195-
selectedPlayer &&
196-
typeof (minecraft as any)?.ImportMcpackWithPlayer === "function"
197-
) {
198-
err = await (minecraft as any)?.ImportMcpackWithPlayer?.(
199-
name,
200-
selectedPlayer,
201-
file.name,
202-
bytes,
203-
overwrite
204-
);
205-
} else {
206-
err = await (minecraft as any)?.ImportMcpack?.(
207-
name,
208-
bytes,
209-
overwrite
210-
);
211-
}
212-
return String(err || "");
213-
} catch (e2: any) {
214-
return String(e2?.message || "IMPORT_ERROR");
166+
const buf = await file.arrayBuffer();
167+
const bytes = Array.from(new Uint8Array(buf));
168+
let err = "";
169+
if (
170+
selectedPlayer &&
171+
typeof (minecraft as any)?.ImportMcpackWithPlayer === "function"
172+
) {
173+
err = await (minecraft as any)?.ImportMcpackWithPlayer?.(
174+
name,
175+
selectedPlayer,
176+
file.name,
177+
bytes,
178+
overwrite
179+
);
180+
} else {
181+
err = await (minecraft as any)?.ImportMcpack?.(
182+
name,
183+
bytes,
184+
overwrite
185+
);
215186
}
187+
return String(err || "");
188+
} catch (e: any) {
189+
return String(e?.message || "IMPORT_ERROR");
216190
}
217191
};
218192
const postImportMcaddon = async (
@@ -221,43 +195,29 @@ export default function ContentPage() {
221195
overwrite: boolean
222196
): Promise<string> => {
223197
try {
224-
const fd = new FormData();
225-
fd.append("name", name);
226-
fd.append("overwrite", overwrite ? "1" : "0");
227-
if (selectedPlayer) fd.append("player", selectedPlayer);
228-
fd.append("file", file, file.name);
229-
const resp = await fetch(
230-
`${importServer || "http://127.0.0.1:32773"}/api/import/mcaddon`,
231-
{ method: "POST", body: fd }
232-
);
233-
const j = (await resp.json().catch(() => ({}))) as any;
234-
return String(j?.error || "");
235-
} catch (e: any) {
236-
try {
237-
const buf = await file.arrayBuffer();
238-
const bytes = Array.from(new Uint8Array(buf));
239-
let err = "";
240-
if (
241-
selectedPlayer &&
242-
typeof (minecraft as any)?.ImportMcaddonWithPlayer === "function"
243-
) {
244-
err = await (minecraft as any)?.ImportMcaddonWithPlayer?.(
245-
name,
246-
selectedPlayer,
247-
bytes,
248-
overwrite
249-
);
250-
} else {
251-
err = await (minecraft as any)?.ImportMcaddon?.(
252-
name,
253-
bytes,
254-
overwrite
255-
);
256-
}
257-
return String(err || "");
258-
} catch (e2: any) {
259-
return String(e2?.message || "IMPORT_ERROR");
198+
const buf = await file.arrayBuffer();
199+
const bytes = Array.from(new Uint8Array(buf));
200+
let err = "";
201+
if (
202+
selectedPlayer &&
203+
typeof (minecraft as any)?.ImportMcaddonWithPlayer === "function"
204+
) {
205+
err = await (minecraft as any)?.ImportMcaddonWithPlayer?.(
206+
name,
207+
selectedPlayer,
208+
bytes,
209+
overwrite
210+
);
211+
} else {
212+
err = await (minecraft as any)?.ImportMcaddon?.(
213+
name,
214+
bytes,
215+
overwrite
216+
);
260217
}
218+
return String(err || "");
219+
} catch (e: any) {
220+
return String(e?.message || "IMPORT_ERROR");
261221
}
262222
};
263223
const postImportMcworld = async (
@@ -267,33 +227,18 @@ export default function ContentPage() {
267227
overwrite: boolean
268228
): Promise<string> => {
269229
try {
270-
const fd = new FormData();
271-
fd.append("name", name);
272-
fd.append("player", player);
273-
fd.append("fileName", file.name);
274-
fd.append("overwrite", overwrite ? "1" : "0");
275-
fd.append("file", file, file.name);
276-
const resp = await fetch(
277-
`${importServer || "http://127.0.0.1:32773"}/api/import/mcworld`,
278-
{ method: "POST", body: fd }
230+
const buf = await file.arrayBuffer();
231+
const bytes = Array.from(new Uint8Array(buf));
232+
const err = await (minecraft as any)?.ImportMcworld?.(
233+
name,
234+
player,
235+
file.name,
236+
bytes,
237+
overwrite
279238
);
280-
const j = (await resp.json().catch(() => ({}))) as any;
281-
return String(j?.error || "");
239+
return String(err || "");
282240
} catch (e: any) {
283-
try {
284-
const buf = await file.arrayBuffer();
285-
const bytes = Array.from(new Uint8Array(buf));
286-
const err = await (minecraft as any)?.ImportMcworld?.(
287-
name,
288-
player,
289-
file.name,
290-
bytes,
291-
overwrite
292-
);
293-
return String(err || "");
294-
} catch (e2: any) {
295-
return String(e2?.message || "IMPORT_ERROR");
296-
}
241+
return String(e?.message || "IMPORT_ERROR");
297242
}
298243
};
299244

‎frontend/src/pages/ModsPage.tsx‎

Lines changed: 22 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ export const ModsPage: React.FC = () => {
4545
const { t } = useTranslation();
4646
const navigate = useNavigate();
4747
const location = useLocation() as any;
48-
const [importServer, setImportServer] = useState<string>("");
4948
const [currentVersionName, setCurrentVersionName] = useState<string>("");
5049
const [modsInfo, setModsInfo] = useState<Array<types.ModInfo>>([]);
5150
const [query, setQuery] = useState("");
@@ -121,48 +120,22 @@ export const ModsPage: React.FC = () => {
121120
const lastScrollTopRef = useRef<number>(0);
122121
const restorePendingRef = useRef<boolean>(false);
123122

124-
useEffect(() => {
125-
(async () => {
126-
try {
127-
const url = await (minecraft as any)?.GetImportServerURL?.();
128-
const u = String(url || "");
129-
setImportServer(u || "http://127.0.0.1:32773");
130-
} catch {
131-
setImportServer("http://127.0.0.1:32773");
132-
}
133-
})();
134-
}, []);
135-
136123
const postImportModZip = async (
137124
name: string,
138125
file: File,
139126
overwrite: boolean
140127
): Promise<string> => {
141-
const base = importServer || "http://127.0.0.1:32773";
142128
try {
143-
const fd = new FormData();
144-
fd.append("name", name);
145-
fd.append("overwrite", overwrite ? "1" : "0");
146-
fd.append("file", file, file.name);
147-
const resp = await fetch(`${base}/api/import/modzip`, {
148-
method: "POST",
149-
body: fd,
150-
});
151-
const j = (await resp.json().catch(() => ({}))) as any;
152-
return String(j?.error || "");
129+
const buf = await file.arrayBuffer();
130+
const bytes = Array.from(new Uint8Array(buf));
131+
const err = await (minecraft as any)?.ImportModZip?.(
132+
name,
133+
bytes,
134+
overwrite
135+
);
136+
return String(err || "");
153137
} catch (e: any) {
154-
try {
155-
const buf = await file.arrayBuffer();
156-
const bytes = Array.from(new Uint8Array(buf));
157-
const err = await (minecraft as any)?.ImportModZip?.(
158-
name,
159-
bytes,
160-
overwrite
161-
);
162-
return String(err || "");
163-
} catch (e2: any) {
164-
return String(e2?.message || "IMPORT_ERROR");
165-
}
138+
return String(e?.message || "IMPORT_ERROR");
166139
}
167140
};
168141
const postImportModDll = async (
@@ -174,39 +147,21 @@ export const ModsPage: React.FC = () => {
174147
version: string,
175148
overwrite: boolean
176149
): Promise<string> => {
177-
const base = importServer || "http://127.0.0.1:32773";
178150
try {
179-
const fd = new FormData();
180-
fd.append("name", name);
181-
fd.append("fileName", fileName);
182-
fd.append("modName", modName);
183-
fd.append("modType", modType);
184-
fd.append("version", version);
185-
fd.append("overwrite", overwrite ? "1" : "0");
186-
fd.append("file", file, fileName);
187-
const resp = await fetch(`${base}/api/import/moddll`, {
188-
method: "POST",
189-
body: fd,
190-
});
191-
const j = (await resp.json().catch(() => ({}))) as any;
192-
return String(j?.error || "");
151+
const buf = await file.arrayBuffer();
152+
const bytes = Array.from(new Uint8Array(buf));
153+
const err = await (minecraft as any)?.ImportModDll?.(
154+
name,
155+
fileName,
156+
bytes,
157+
modName,
158+
modType,
159+
version,
160+
overwrite
161+
);
162+
return String(err || "");
193163
} catch (e: any) {
194-
try {
195-
const buf = await file.arrayBuffer();
196-
const bytes = Array.from(new Uint8Array(buf));
197-
const err = await (minecraft as any)?.ImportModDll?.(
198-
name,
199-
fileName,
200-
bytes,
201-
modName,
202-
modType,
203-
version,
204-
overwrite
205-
);
206-
return String(err || "");
207-
} catch (e2: any) {
208-
return String(e2?.message || "IMPORT_ERROR");
209-
}
164+
return String(e?.message || "IMPORT_ERROR");
210165
}
211166
};
212167

0 commit comments

Comments
 (0)