feat: upgrade to tauri v2 rc

This commit is contained in:
reya
2024-08-10 16:45:56 +07:00
parent 4c6d1c768a
commit e2103ae23a
32 changed files with 5517 additions and 5551 deletions

View File

@@ -9,6 +9,6 @@
"devDependencies": {
"@lume/tsconfig": "workspace:*",
"@types/react": "^18.3.3",
"typescript": "^5.5.3"
"typescript": "^5.5.4"
}
}

View File

@@ -5,15 +5,15 @@
"main": "./src/index.ts",
"dependencies": {
"@lume/utils": "workspace:^",
"@tanstack/query-persist-client-core": "^5.51.9",
"@tanstack/react-query": "^5.51.9",
"nostr-tools": "^2.7.1",
"@tanstack/query-persist-client-core": "^5.51.21",
"@tanstack/react-query": "^5.51.23",
"nostr-tools": "^2.7.2",
"react": "^18.3.1"
},
"devDependencies": {
"@lume/tsconfig": "workspace:^",
"@lume/types": "workspace:^",
"@types/react": "^18.3.3",
"typescript": "^5.5.3"
"typescript": "^5.5.4"
}
}

View File

@@ -1,11 +1,12 @@
// This file was generated by [tauri-specta](https://github.com/oscartbeaumont/tauri-specta). Do not edit this file manually.
// This file was generated by [tauri-specta](https://github.com/oscartbeaumont/tauri-specta). Do not edit this file manually.
/** user-defined commands **/
/** user-defined commands **/
export const commands = {
export const commands = {
async getRelays() : Promise<Result<Relays, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_relays") };
} catch (e) {
if(e instanceof Error) throw e;
@@ -13,7 +14,7 @@ try {
}
},
async connectRelay(relay: string) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("connect_relay", { relay }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -21,7 +22,7 @@ try {
}
},
async removeRelay(relay: string) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("remove_relay", { relay }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -29,7 +30,7 @@ try {
}
},
async getBootstrapRelays() : Promise<Result<string[], string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_bootstrap_relays") };
} catch (e) {
if(e instanceof Error) throw e;
@@ -37,7 +38,7 @@ try {
}
},
async saveBootstrapRelays(relays: string) : Promise<Result<null, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("save_bootstrap_relays", { relays }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -45,10 +46,10 @@ try {
}
},
async getAccounts() : Promise<string[]> {
return await TAURI_INVOKE("get_accounts");
return await TAURI_INVOKE("get_accounts");
},
async createAccount() : Promise<Result<Account, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("create_account") };
} catch (e) {
if(e instanceof Error) throw e;
@@ -56,7 +57,7 @@ try {
}
},
async saveAccount(nsec: string, password: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("save_account", { nsec, password }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -64,7 +65,7 @@ try {
}
},
async getEncryptedKey(npub: string, password: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_encrypted_key", { npub, password }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -72,7 +73,7 @@ try {
}
},
async getPrivateKey(npub: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_private_key", { npub }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -80,7 +81,7 @@ try {
}
},
async connectRemoteAccount(uri: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("connect_remote_account", { uri }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -88,7 +89,7 @@ try {
}
},
async loadAccount(npub: string, bunker: string | null) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("load_account", { npub, bunker }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -96,7 +97,7 @@ try {
}
},
async getCurrentProfile() : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_current_profile") };
} catch (e) {
if(e instanceof Error) throw e;
@@ -104,7 +105,7 @@ try {
}
},
async getProfile(id: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_profile", { id }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -112,7 +113,7 @@ try {
}
},
async getContactList() : Promise<Result<string[], string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_contact_list") };
} catch (e) {
if(e instanceof Error) throw e;
@@ -120,7 +121,7 @@ try {
}
},
async setContactList(publicKeys: string[]) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("set_contact_list", { publicKeys }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -128,7 +129,7 @@ try {
}
},
async createProfile(name: string, displayName: string, about: string, picture: string, banner: string, nip05: string, lud16: string, website: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("create_profile", { name, displayName, about, picture, banner, nip05, lud16, website }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -136,7 +137,7 @@ try {
}
},
async isContactListEmpty() : Promise<Result<boolean, null>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("is_contact_list_empty") };
} catch (e) {
if(e instanceof Error) throw e;
@@ -144,7 +145,7 @@ try {
}
},
async checkContact(hex: string) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("check_contact", { hex }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -152,7 +153,7 @@ try {
}
},
async toggleContact(hex: string, alias: string | null) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("toggle_contact", { hex, alias }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -160,7 +161,7 @@ try {
}
},
async getNstore(key: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_nstore", { key }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -168,7 +169,7 @@ try {
}
},
async setNstore(key: string, content: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("set_nstore", { key, content }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -176,7 +177,7 @@ try {
}
},
async setWallet(uri: string) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("set_wallet", { uri }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -184,7 +185,7 @@ try {
}
},
async loadWallet() : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("load_wallet") };
} catch (e) {
if(e instanceof Error) throw e;
@@ -192,7 +193,7 @@ try {
}
},
async removeWallet() : Promise<Result<null, null>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("remove_wallet") };
} catch (e) {
if(e instanceof Error) throw e;
@@ -200,7 +201,7 @@ try {
}
},
async zapProfile(id: string, amount: string, message: string) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("zap_profile", { id, amount, message }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -208,7 +209,7 @@ try {
}
},
async zapEvent(id: string, amount: string, message: string) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("zap_event", { id, amount, message }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -216,7 +217,7 @@ try {
}
},
async friendToFriend(npub: string) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("friend_to_friend", { npub }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -224,7 +225,7 @@ try {
}
},
async getNotifications() : Promise<Result<string[], string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_notifications") };
} catch (e) {
if(e instanceof Error) throw e;
@@ -232,7 +233,7 @@ try {
}
},
async getSettings() : Promise<Result<Settings, null>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_settings") };
} catch (e) {
if(e instanceof Error) throw e;
@@ -240,7 +241,7 @@ try {
}
},
async setNewSettings(settings: string) : Promise<Result<null, null>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("set_new_settings", { settings }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -248,7 +249,7 @@ try {
}
},
async verifyNip05(key: string, nip05: string) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("verify_nip05", { key, nip05 }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -256,7 +257,7 @@ try {
}
},
async getEventMeta(content: string) : Promise<Result<Meta, null>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_event_meta", { content }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -264,7 +265,7 @@ try {
}
},
async getEvent(id: string) : Promise<Result<RichEvent, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_event", { id }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -272,7 +273,7 @@ try {
}
},
async getEventFrom(id: string, relayHint: string) : Promise<Result<RichEvent, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_event_from", { id, relayHint }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -280,7 +281,7 @@ try {
}
},
async getReplies(id: string) : Promise<Result<RichEvent[], string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_replies", { id }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -288,7 +289,7 @@ try {
}
},
async listenEventReply(id: string) : Promise<Result<null, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("listen_event_reply", { id }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -296,7 +297,7 @@ try {
}
},
async getEventsBy(publicKey: string, asOf: string | null) : Promise<Result<RichEvent[], string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_events_by", { publicKey, asOf }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -304,7 +305,7 @@ try {
}
},
async getLocalEvents(until: string | null) : Promise<Result<RichEvent[], string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_local_events", { until }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -312,7 +313,7 @@ try {
}
},
async listenLocalEvent(label: string) : Promise<Result<null, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("listen_local_event", { label }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -320,7 +321,7 @@ try {
}
},
async getGroupEvents(publicKeys: string[], until: string | null) : Promise<Result<RichEvent[], string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_group_events", { publicKeys, until }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -328,7 +329,7 @@ try {
}
},
async getGlobalEvents(until: string | null) : Promise<Result<RichEvent[], string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_global_events", { until }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -336,7 +337,7 @@ try {
}
},
async getHashtagEvents(hashtags: string[], until: string | null) : Promise<Result<RichEvent[], string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("get_hashtag_events", { hashtags, until }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -344,7 +345,7 @@ try {
}
},
async publish(content: string, warning: string | null, difficulty: number | null) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("publish", { content, warning, difficulty }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -352,7 +353,7 @@ try {
}
},
async reply(content: string, to: string, root: string | null) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("reply", { content, to, root }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -360,7 +361,7 @@ try {
}
},
async repost(raw: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("repost", { raw }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -368,7 +369,7 @@ try {
}
},
async eventToBech32(id: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("event_to_bech32", { id }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -376,7 +377,7 @@ try {
}
},
async userToBech32(user: string) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("user_to_bech32", { user }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -384,7 +385,7 @@ try {
}
},
async unlisten(id: string) : Promise<Result<null, null>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("unlisten", { id }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -392,7 +393,7 @@ try {
}
},
async createColumn(column: Column) : Promise<Result<string, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("create_column", { column }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -400,7 +401,7 @@ try {
}
},
async closeColumn(label: string) : Promise<Result<boolean, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("close_column", { label }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -408,7 +409,7 @@ try {
}
},
async repositionColumn(label: string, x: number, y: number) : Promise<Result<null, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("reposition_column", { label, x, y }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -416,7 +417,7 @@ try {
}
},
async resizeColumn(label: string, width: number, height: number) : Promise<Result<null, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("resize_column", { label, width, height }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -424,7 +425,7 @@ try {
}
},
async reloadColumn(label: string) : Promise<Result<null, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("reload_column", { label }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -432,7 +433,7 @@ try {
}
},
async openWindow(window: Window) : Promise<Result<null, string>> {
try {
try {
return { status: "ok", data: await TAURI_INVOKE("open_window", { window }) };
} catch (e) {
if(e instanceof Error) throw e;
@@ -440,23 +441,23 @@ try {
}
},
async openMainWindow() : Promise<void> {
await TAURI_INVOKE("open_main_window");
await TAURI_INVOKE("open_main_window");
},
async forceQuit() : Promise<void> {
await TAURI_INVOKE("force_quit");
await TAURI_INVOKE("force_quit");
},
async setBadge(count: number) : Promise<void> {
await TAURI_INVOKE("set_badge", { count });
await TAURI_INVOKE("set_badge", { count });
}
}
/** user-defined events **/
/** user-defined events **/
/** user-defined statics **/
/** user-defined constants **/
/** user-defined types **/
@@ -470,59 +471,60 @@ export type Window = { label: string; title: string; url: string; width: number;
/** tauri-specta globals **/
import { invoke as TAURI_INVOKE } from "@tauri-apps/api/core";
import {
invoke as TAURI_INVOKE,
Channel as TAURI_CHANNEL,
} from "@tauri-apps/api/core";
import * as TAURI_API_EVENT from "@tauri-apps/api/event";
import { type WebviewWindow as __WebviewWindow__ } from "@tauri-apps/api/webviewWindow";
type __EventObj__<T> = {
listen: (
cb: TAURI_API_EVENT.EventCallback<T>
) => ReturnType<typeof TAURI_API_EVENT.listen<T>>;
once: (
cb: TAURI_API_EVENT.EventCallback<T>
) => ReturnType<typeof TAURI_API_EVENT.once<T>>;
emit: T extends null
? (payload?: T) => ReturnType<typeof TAURI_API_EVENT.emit>
: (payload: T) => ReturnType<typeof TAURI_API_EVENT.emit>;
listen: (
cb: TAURI_API_EVENT.EventCallback<T>,
) => ReturnType<typeof TAURI_API_EVENT.listen<T>>;
once: (
cb: TAURI_API_EVENT.EventCallback<T>,
) => ReturnType<typeof TAURI_API_EVENT.once<T>>;
emit: T extends null
? (payload?: T) => ReturnType<typeof TAURI_API_EVENT.emit>
: (payload: T) => ReturnType<typeof TAURI_API_EVENT.emit>;
};
export type Result<T, E> =
| { status: "ok"; data: T }
| { status: "error"; error: E };
| { status: "ok"; data: T }
| { status: "error"; error: E };
function __makeEvents__<T extends Record<string, any>>(
mappings: Record<keyof T, string>
mappings: Record<keyof T, string>,
) {
return new Proxy(
{} as unknown as {
[K in keyof T]: __EventObj__<T[K]> & {
(handle: __WebviewWindow__): __EventObj__<T[K]>;
};
},
{
get: (_, event) => {
const name = mappings[event as keyof T];
return new Proxy(
{} as unknown as {
[K in keyof T]: __EventObj__<T[K]> & {
(handle: __WebviewWindow__): __EventObj__<T[K]>;
};
},
{
get: (_, event) => {
const name = mappings[event as keyof T];
return new Proxy((() => {}) as any, {
apply: (_, __, [window]: [__WebviewWindow__]) => ({
listen: (arg: any) => window.listen(name, arg),
once: (arg: any) => window.once(name, arg),
emit: (arg: any) => window.emit(name, arg),
}),
get: (_, command: keyof __EventObj__<any>) => {
switch (command) {
case "listen":
return (arg: any) => TAURI_API_EVENT.listen(name, arg);
case "once":
return (arg: any) => TAURI_API_EVENT.once(name, arg);
case "emit":
return (arg: any) => TAURI_API_EVENT.emit(name, arg);
}
},
});
},
}
);
return new Proxy((() => {}) as any, {
apply: (_, __, [window]: [__WebviewWindow__]) => ({
listen: (arg: any) => window.listen(name, arg),
once: (arg: any) => window.once(name, arg),
emit: (arg: any) => window.emit(name, arg),
}),
get: (_, command: keyof __EventObj__<any>) => {
switch (command) {
case "listen":
return (arg: any) => TAURI_API_EVENT.listen(name, arg);
case "once":
return (arg: any) => TAURI_API_EVENT.once(name, arg);
case "emit":
return (arg: any) => TAURI_API_EVENT.emit(name, arg);
}
},
});
},
},
);
}

View File

@@ -12,10 +12,10 @@
"devDependencies": {
"@evilmartians/harmony": "^1.2.0",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.13",
"@tailwindcss/typography": "^0.5.14",
"tailwind-gradient-mask-image": "^1.2.0",
"tailwind-scrollbar": "^3.1.0",
"tailwindcss": "^3.4.6",
"tailwindcss": "^3.4.9",
"tailwindcss-content-visibility": "^0.2.0"
}
}

View File

@@ -9,6 +9,6 @@
"access": "public"
},
"devDependencies": {
"typescript": "^5.5.3"
"typescript": "^5.5.4"
}
}

View File

@@ -15,7 +15,7 @@
"@lume/tsconfig": "workspace:^",
"@lume/types": "workspace:^",
"@types/react": "^18.3.3",
"tailwindcss": "^3.4.6",
"typescript": "^5.5.3"
"tailwindcss": "^3.4.9",
"typescript": "^5.5.4"
}
}

View File

@@ -10,13 +10,13 @@
"dependencies": {
"bitcoin-units": "^1.0.0",
"clsx": "^2.1.1",
"dayjs": "^1.11.11",
"dayjs": "^1.11.12",
"light-bolt11-decoder": "^3.1.1",
"nostr-tools": "^2.7.1",
"nostr-tools": "^2.7.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"slate": "^0.103.0",
"slate-react": "^0.105.0"
"slate-react": "^0.107.1"
},
"devDependencies": {
"@lume/tsconfig": "workspace:^",
@@ -24,6 +24,6 @@
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"tailwind-merge": "^2.4.0",
"typescript": "^5.5.3"
"typescript": "^5.5.4"
}
}