tauri bindings

.gitignore

@@ -13,4 +13,5 @@ dist
 packages/orderbook/cjs.js
 packages/orderbook/cjs.d.ts
 packages/orderbook/esm.js
-packages/orderbook/esm.d.ts
+packages/orderbook/esm.d.ts
+tauri-app/src/lib/types

crates/settings/src/lib.rs

@@ -16,7 +16,6 @@ pub mod remote;
 pub mod scenario;
 pub mod sentry;
 pub mod subgraph;
-pub mod tauri;
 pub mod token;
 pub mod unit_test;
 pub mod yaml;

tauri-app/package.json

@@ -6,16 +6,20 @@
   "author": "Rain Open Source Software Ltd",
   "scripts": {
     "dev": "vite dev",
-    "build": "vite build",
+    "build": "npm run build-bindings && vite build",
     "preview": "vite preview",
     "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
     "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
     "lint": "eslint --fix src",
     "test": "vitest run",
     "lint-check": "eslint src",
     "format": "prettier --write src",
+    "format-bindings": "prettier --write src/lib/types",
     "format-check": "prettier --list-different src",
-    "svelte-lint-format-check": "npm run check && npm run lint-check && npm run format-check"
+    "svelte-lint-format-check": "npm run check && npm run lint-check && npm run format-check",
+    "build-bindings": "npm run rm-temp && npm run build-wasm && node ./scripts/build.cjs && npm run format-bindings",
+    "build-wasm": "cd src-tauri && cargo build --target wasm32-unknown-unknown --lib -r && cd ..",
+    "rm-temp": "rimraf ./temp"
   },
   "devDependencies": {
     "postcss": "^8.4.32",

tauri-app/scripts/build.cjs

@@ -0,0 +1,26 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const fs = require('node:fs');
+const { execSync } = require('node:child_process');
+
+// create dirs
+fs.mkdirSync('./temp', { recursive: true });
+fs.mkdirSync('./src/lib/types', { recursive: true });
+
+// generate bindgens
+execSync(
+  `wasm-bindgen --target nodejs ./src-tauri/target/wasm32-unknown-unknown/release/tauri_app.wasm --out-dir ./temp --out-name tauriBindings`,
+);
+
+// prepare and move to src/lib/types
+let dts = fs.readFileSync(`./temp/tauriBindings.d.ts`, {
+  encoding: 'utf-8',
+});
+dts = dts.replace(
+  `/* tslint:disable */
+/* eslint-disable */`,
+  '',
+);
+dts = '/* this file is auto-generated, do not modify */\n' + dts;
+fs.writeFileSync(`./src/lib/types/tauriBindings.ts`, dts);
+
+execSync('npm run rm-temp');

tauri-app/src-tauri/Cargo.toml

@@ -8,12 +8,22 @@ author = "Rain Open Source Software Ltd"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+# for building bindings
+[lib]
+crate-type = ["cdylib"]
+
 [build-dependencies]
 tauri-build = { version = "1.5", features = [] }
 
 [dependencies]
-tauri = { version = "1.5", features = [ "os-all", "window-start-dragging", "fs-write-file", "fs-read-file", "dialog-open", "dialog-save", "shell-open"] }
 serde = { version = "1.0", features = ["derive"] }
+chrono = { version = "0.4.31", features = ["serde"] }
+uuid = { version = "1.7.0", features = ["serde"] }
+rain-erc = { git = "https://github.com/rainlanguage/rain.erc", rev = "0106e645ebd49334addc698c5aad9a85370eb54d" }
+rain-metadata = { path = "../../lib/rain.interpreter/lib/rain.metadata/crates/cli" }
+
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+tauri = { version = "1.5", features = [ "os-all", "window-start-dragging", "fs-write-file", "fs-read-file", "dialog-open", "dialog-save", "shell-open"] }
 serde_json = "1.0"
 rain_orderbook_common = { path = "../../crates/common" }
 rain_orderbook_quote = { path = "../../crates/quote" }
@@ -23,16 +33,15 @@ rain_orderbook_bindings = { path = "../../crates/bindings" }
 alloy-ethers-typecast = { git = "https://github.com/rainlanguage/alloy-ethers-typecast", rev = "65a68f207287d024cba934bf1e3c8b3f63d2834a" }
 alloy = { version = "0.1.4", features = ["full", "node-bindings"] }
 reqwest = { version = "0.11.22", features = ["json"] }
-chrono = { version = "0.4.32", features = ["serde"] }
-uuid = { version = "1.7.0", features = ["serde"] }
 serde_bytes = "0.11.14"
 thiserror = "1.0.56"
 url = "2.5.0"
 serde_yaml = "0.9.32"
 dotrain = "6.0.1-alpha.24"
 futures = "0.3.17"
-rain-erc = { git = "https://github.com/rainlanguage/rain.erc", rev = "0106e645ebd49334addc698c5aad9a85370eb54d" }
-rain-metadata = { path = "../../lib/rain.interpreter/lib/rain.metadata/crates/cli" }
+
+[target.'cfg(target_family = "wasm")'.dependencies]
+wasm-bindgen-utils = "0.0"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem

tauri-app/src-tauri/src/lib.rs

@@ -0,0 +1,2 @@
+#[cfg(target_family = "wasm")]
+pub mod types;

tauri-app/src-tauri/src/main.rs

@@ -4,6 +4,7 @@
 pub mod error;
 pub mod toast;
 pub mod transaction_status;
+pub mod types;
 
 mod commands;
 use commands::app::get_app_commit_sha;

tauri-app/src-tauri/src/toast.rs

@@ -1,15 +1,8 @@
-use rain_orderbook_app_settings::tauri::ToastMessageType;
-use serde::{Deserialize, Serialize};
+use crate::types::{ToastMessageType, ToastPayload};
 use tauri::{AppHandle, Manager};
 
-#[derive(Serialize, Deserialize, Clone)]
-pub struct ToastPayload {
-    pub message_type: ToastMessageType,
-    pub text: String,
-}
-
 impl ToastPayload {
-    pub fn emit(&self, app_handle: AppHandle) {
+    fn emit(&self, app_handle: AppHandle) {
         let _ = app_handle.emit_all("toast", self);
     }
 }

tauri-app/src-tauri/src/transaction_status.rs

@@ -1,22 +1,11 @@
 use alloy::sol_types::SolCall;
 use alloy_ethers_typecast::transaction::WriteTransactionStatus;
-use chrono::{DateTime, Utc};
-use serde::{Deserialize, Serialize};
+use chrono::Utc;
+use crate::types::{TransactionStatus, TransactionStatusNotice};
 use std::sync::RwLock;
 use tauri::{AppHandle, Manager};
 use uuid::Uuid;
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
-#[serde(tag = "type", content = "payload")]
-pub enum TransactionStatus {
-    Initialized,
-    PendingPrepare,
-    PendingSign,
-    PendingSend,
-    Confirmed(String),
-    Failed(String),
-}
-
 impl<T: SolCall + Clone> From<WriteTransactionStatus<T>> for TransactionStatus {
     fn from(val: WriteTransactionStatus<T>) -> Self {
         match val {
@@ -30,16 +19,6 @@ impl<T: SolCall + Clone> From<WriteTransactionStatus<T>> for TransactionStatus {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug)]
-pub struct TransactionStatusNotice {
-    pub id: Uuid,
-    pub status: TransactionStatus,
-    pub created_at: DateTime<Utc>,
-
-    /// Human-readable label to display in the UI, describing the transaction i.e. "Approving ERC20 Token Spend"
-    pub label: String,
-}
-
 pub struct TransactionStatusNoticeRwLock(RwLock<TransactionStatusNotice>);
 
 impl TransactionStatusNoticeRwLock {

tauri-app/src-tauri/src/types/mod.rs

@@ -0,0 +1,5 @@
+mod toast;
+mod transaction_status;
+
+pub use toast::*;
+pub use transaction_status::*;

tauri-app/src-tauri/src/types/toast.rs

@@ -0,0 +1,21 @@
+use serde::{Deserialize, Serialize};
+#[cfg(target_family = "wasm")]
+use wasm_bindgen_utils::{impl_wasm_traits, prelude::*};
+
+#[derive(Serialize, Deserialize, Clone)]
+#[cfg_attr(target_family = "wasm", wasm_bindgen)]
+pub enum ToastMessageType {
+    Success,
+    Error,
+    Warning,
+    Info,
+}
+
+#[derive(Serialize, Deserialize, Clone)]
+#[cfg_attr(target_family = "wasm", derive(Tsify))]
+pub struct ToastPayload {
+    pub message_type: ToastMessageType,
+    pub text: String,
+}
+#[cfg(target_family = "wasm")]
+impl_wasm_traits!(ToastPayload);

tauri-app/src-tauri/src/types/transaction_status.rs

@@ -0,0 +1,33 @@
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+#[cfg(target_family = "wasm")]
+use wasm_bindgen_utils::{impl_wasm_traits, prelude::*};
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[serde(tag = "type", content = "payload")]
+#[cfg_attr(target_family = "wasm", derive(Tsify))]
+pub enum TransactionStatus {
+    Initialized,
+    PendingPrepare,
+    PendingSign,
+    PendingSend,
+    Confirmed(String),
+    Failed(String),
+}
+#[cfg(target_family = "wasm")]
+impl_wasm_traits!(TransactionStatus);
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+#[cfg_attr(target_family = "wasm", derive(Tsify))]
+pub struct TransactionStatusNotice {
+    #[cfg_attr(target_family = "wasm", tsify(type = "string"))]
+    pub id: Uuid,
+    pub status: TransactionStatus,
+    #[cfg_attr(target_family = "wasm", tsify(type = "string"))]
+    pub created_at: DateTime<Utc>,
+    /// Human-readable label to display in the UI, describing the transaction i.e. "Approving ERC20 Token Spend"
+    pub label: String,
+}
+#[cfg(target_family = "wasm")]
+impl_wasm_traits!(TransactionStatusNotice);

tauri-app/src/lib/components/AppToast.svelte

@@ -3,7 +3,7 @@
   import { IconError, IconSuccess, IconWarning, IconInfo } from '@rainlanguage/ui-components';
   import CloseSolid from 'flowbite-svelte-icons/CloseSolid.svelte';
   import type { ToastData } from '$lib/stores/toasts';
-  import { ToastMessageType } from '@rainlanguage/orderbook/js_api';
+  import { ToastMessageType } from '$lib/types/tauriBindings';
 
   export let toast: ToastData;
   let toastColor: