Sync implementation using cr-sqlite + websockets, across JS and CLI clients #1
|
|
@ -1,25 +1,24 @@
|
||||||
package main
|
package mast
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
)
|
)
|
||||||
|
|
||||||
func RunMigrations(db *sql.DB) error {
|
func RunMigrations(db *sql.DB) error {
|
||||||
// Load the cr-sqlite extension
|
// Load the cr-sqlite extension
|
||||||
_, err := db.Exec("SELECT load_extension('crsqlite.so')")
|
// _, err := db.Exec("SELECT load_extension('./crsqlite.so', 'sqlite3_crsqlite_init')")
|
||||||
if err != nil {
|
// if err != nil {
|
||||||
return err
|
// return fmt.Errorf("failed to load cr-sqlite extension: %w", err)
|
||||||
}
|
// }
|
||||||
|
|
||||||
// Create the todos table and initialize it as a CRDT
|
// Create the todos table and initialize it as a CRDT
|
||||||
_, err = db.Exec(`
|
_, err := db.Exec(`
|
||||||
CREATE TABLE IF NOT EXISTS todos (id INTEGER PRIMARY KEY, content TEXT);
|
CREATE TABLE IF NOT EXISTS todos (id blob PRIMARY KEY NOT NULL, content TEXT, completed INTEGER NOT NULL DEFAULT 0);
|
||||||
SELECT crsql_as_crr('todos');
|
SELECT crsql_as_crr('todos');
|
||||||
`)
|
`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,11 @@
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
devShells."x86_64-linux".default = pkgs.mkShell {
|
devShells."x86_64-linux".default = pkgs.mkShell {
|
||||||
packages = [ pkgs.go ];
|
packages = with pkgs; [
|
||||||
|
go
|
||||||
|
sqlite
|
||||||
|
nodejs
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
17
go.mod
17
go.mod
|
|
@ -3,17 +3,30 @@ module mast
|
||||||
go 1.21.6
|
go 1.21.6
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/charmbracelet/bubbletea v0.26.6 // indirect
|
github.com/charmbracelet/bubbles v0.18.0
|
||||||
|
github.com/charmbracelet/bubbletea v0.26.6
|
||||||
|
github.com/gofrs/uuid v4.4.0+incompatible
|
||||||
|
github.com/mattn/go-sqlite3 v1.14.22
|
||||||
|
)
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/atotto/clipboard v0.1.4 // indirect
|
||||||
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
||||||
|
github.com/charmbracelet/lipgloss v0.9.1 // indirect
|
||||||
github.com/charmbracelet/x/ansi v0.1.2 // indirect
|
github.com/charmbracelet/x/ansi v0.1.2 // indirect
|
||||||
github.com/charmbracelet/x/input v0.1.0 // indirect
|
github.com/charmbracelet/x/input v0.1.0 // indirect
|
||||||
github.com/charmbracelet/x/term v0.1.1 // indirect
|
github.com/charmbracelet/x/term v0.1.1 // indirect
|
||||||
github.com/charmbracelet/x/windows v0.1.0 // indirect
|
github.com/charmbracelet/x/windows v0.1.0 // indirect
|
||||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
||||||
|
github.com/gorilla/websocket v1.5.3 // indirect
|
||||||
|
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
||||||
|
github.com/mattn/go-isatty v0.0.18 // indirect
|
||||||
github.com/mattn/go-localereader v0.0.1 // indirect
|
github.com/mattn/go-localereader v0.0.1 // indirect
|
||||||
github.com/mattn/go-runewidth v0.0.15 // indirect
|
github.com/mattn/go-runewidth v0.0.15 // indirect
|
||||||
github.com/mattn/go-sqlite3 v1.14.22 // indirect
|
|
||||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
|
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
|
||||||
github.com/muesli/cancelreader v0.2.2 // indirect
|
github.com/muesli/cancelreader v0.2.2 // indirect
|
||||||
|
github.com/muesli/reflow v0.3.0 // indirect
|
||||||
|
github.com/muesli/termenv v0.15.2 // indirect
|
||||||
github.com/rivo/uniseg v0.4.7 // indirect
|
github.com/rivo/uniseg v0.4.7 // indirect
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||||
golang.org/x/sync v0.7.0 // indirect
|
golang.org/x/sync v0.7.0 // indirect
|
||||||
|
|
|
||||||
25
go.sum
25
go.sum
|
|
@ -1,5 +1,13 @@
|
||||||
|
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
|
||||||
|
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
|
||||||
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
|
||||||
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
|
||||||
|
github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0=
|
||||||
|
github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw=
|
||||||
github.com/charmbracelet/bubbletea v0.26.6 h1:zTCWSuST+3yZYZnVSvbXwKOPRSNZceVeqpzOLN2zq1s=
|
github.com/charmbracelet/bubbletea v0.26.6 h1:zTCWSuST+3yZYZnVSvbXwKOPRSNZceVeqpzOLN2zq1s=
|
||||||
github.com/charmbracelet/bubbletea v0.26.6/go.mod h1:dz8CWPlfCCGLFbBlTY4N7bjLiyOGDJEnd2Muu7pOWhk=
|
github.com/charmbracelet/bubbletea v0.26.6/go.mod h1:dz8CWPlfCCGLFbBlTY4N7bjLiyOGDJEnd2Muu7pOWhk=
|
||||||
|
github.com/charmbracelet/lipgloss v0.9.1 h1:PNyd3jvaJbg4jRHKWXnCj1akQm4rh8dbEzN1p/u1KWg=
|
||||||
|
github.com/charmbracelet/lipgloss v0.9.1/go.mod h1:1mPmG4cxScwUQALAAnacHaigiiHB9Pmr+v1VEawJl6I=
|
||||||
github.com/charmbracelet/x/ansi v0.1.2 h1:6+LR39uG8DE6zAmbu023YlqjJHkYXDF1z36ZwzO4xZY=
|
github.com/charmbracelet/x/ansi v0.1.2 h1:6+LR39uG8DE6zAmbu023YlqjJHkYXDF1z36ZwzO4xZY=
|
||||||
github.com/charmbracelet/x/ansi v0.1.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
|
github.com/charmbracelet/x/ansi v0.1.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
|
||||||
github.com/charmbracelet/x/input v0.1.0 h1:TEsGSfZYQyOtp+STIjyBq6tpRaorH0qpwZUj8DavAhQ=
|
github.com/charmbracelet/x/input v0.1.0 h1:TEsGSfZYQyOtp+STIjyBq6tpRaorH0qpwZUj8DavAhQ=
|
||||||
|
|
@ -10,8 +18,17 @@ github.com/charmbracelet/x/windows v0.1.0 h1:gTaxdvzDM5oMa/I2ZNF7wN78X/atWemG9Wp
|
||||||
github.com/charmbracelet/x/windows v0.1.0/go.mod h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ=
|
github.com/charmbracelet/x/windows v0.1.0/go.mod h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ=
|
||||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
|
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
|
||||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
|
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
|
||||||
|
github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
|
||||||
|
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
|
||||||
|
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
|
||||||
|
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||||
|
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
|
||||||
|
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
||||||
|
github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
|
||||||
|
github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||||
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
|
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
|
||||||
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
|
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
|
||||||
|
github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
|
||||||
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
|
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
|
||||||
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||||
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
|
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
|
||||||
|
|
@ -20,14 +37,22 @@ github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D
|
||||||
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
|
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
|
||||||
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
|
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
|
||||||
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
|
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
|
||||||
|
github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
|
||||||
|
github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
|
||||||
|
github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
|
||||||
|
github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
|
||||||
|
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||||
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
|
||||||
|
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
|
||||||
|
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
|
||||||
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
||||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
|
||||||
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
|
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
|
||||||
|
|
|
||||||
24
js/.gitignore
vendored
Normal file
24
js/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,24 @@
|
||||||
|
# Logs
|
||||||
|
logs
|
||||||
|
*.log
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
pnpm-debug.log*
|
||||||
|
lerna-debug.log*
|
||||||
|
|
||||||
|
node_modules
|
||||||
|
dist
|
||||||
|
dist-ssr
|
||||||
|
*.local
|
||||||
|
|
||||||
|
# Editor directories and files
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.idea
|
||||||
|
.DS_Store
|
||||||
|
*.suo
|
||||||
|
*.ntvs*
|
||||||
|
*.njsproj
|
||||||
|
*.sln
|
||||||
|
*.sw?
|
||||||
3
js/.vscode/extensions.json
vendored
Normal file
3
js/.vscode/extensions.json
vendored
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"recommendations": ["svelte.svelte-vscode"]
|
||||||
|
}
|
||||||
47
js/README.md
Normal file
47
js/README.md
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
# Svelte + Vite
|
||||||
|
|
||||||
|
This template should help get you started developing with Svelte in Vite.
|
||||||
|
|
||||||
|
## Recommended IDE Setup
|
||||||
|
|
||||||
|
[VS Code](https://code.visualstudio.com/) + [Svelte](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode).
|
||||||
|
|
||||||
|
## Need an official Svelte framework?
|
||||||
|
|
||||||
|
Check out [SvelteKit](https://github.com/sveltejs/kit#readme), which is also powered by Vite. Deploy anywhere with its serverless-first approach and adapt to various platforms, with out of the box support for TypeScript, SCSS, and Less, and easily-added support for mdsvex, GraphQL, PostCSS, Tailwind CSS, and more.
|
||||||
|
|
||||||
|
## Technical considerations
|
||||||
|
|
||||||
|
**Why use this over SvelteKit?**
|
||||||
|
|
||||||
|
- It brings its own routing solution which might not be preferable for some users.
|
||||||
|
- It is first and foremost a framework that just happens to use Vite under the hood, not a Vite app.
|
||||||
|
|
||||||
|
This template contains as little as possible to get started with Vite + Svelte, while taking into account the developer experience with regards to HMR and intellisense. It demonstrates capabilities on par with the other `create-vite` templates and is a good starting point for beginners dipping their toes into a Vite + Svelte project.
|
||||||
|
|
||||||
|
Should you later need the extended capabilities and extensibility provided by SvelteKit, the template has been structured similarly to SvelteKit so that it is easy to migrate.
|
||||||
|
|
||||||
|
**Why `global.d.ts` instead of `compilerOptions.types` inside `jsconfig.json` or `tsconfig.json`?**
|
||||||
|
|
||||||
|
Setting `compilerOptions.types` shuts out all other types not explicitly listed in the configuration. Using triple-slash references keeps the default TypeScript setting of accepting type information from the entire workspace, while also adding `svelte` and `vite/client` type information.
|
||||||
|
|
||||||
|
**Why include `.vscode/extensions.json`?**
|
||||||
|
|
||||||
|
Other templates indirectly recommend extensions via the README, but this file allows VS Code to prompt the user to install the recommended extension upon opening the project.
|
||||||
|
|
||||||
|
**Why enable `checkJs` in the JS template?**
|
||||||
|
|
||||||
|
It is likely that most cases of changing variable types in runtime are likely to be accidental, rather than deliberate. This provides advanced typechecking out of the box. Should you like to take advantage of the dynamically-typed nature of JavaScript, it is trivial to change the configuration.
|
||||||
|
|
||||||
|
**Why is HMR not preserving my local component state?**
|
||||||
|
|
||||||
|
HMR state preservation comes with a number of gotchas! It has been disabled by default in both `svelte-hmr` and `@sveltejs/vite-plugin-svelte` due to its often surprising behavior. You can read the details [here](https://github.com/sveltejs/svelte-hmr/tree/master/packages/svelte-hmr#preservation-of-local-state).
|
||||||
|
|
||||||
|
If you have state that's important to retain within a component, consider creating an external store which would not be replaced by HMR.
|
||||||
|
|
||||||
|
```js
|
||||||
|
// store.js
|
||||||
|
// An extremely simple external store
|
||||||
|
import { writable } from 'svelte/store'
|
||||||
|
export default writable(0)
|
||||||
|
```
|
||||||
13
js/index.html
Normal file
13
js/index.html
Normal file
|
|
@ -0,0 +1,13 @@
|
||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Vite + Svelte</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="app"></div>
|
||||||
|
<script type="module" src="/src/main.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
32
js/jsconfig.json
Normal file
32
js/jsconfig.json
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"target": "ESNext",
|
||||||
|
"module": "ESNext",
|
||||||
|
/**
|
||||||
|
* svelte-preprocess cannot figure out whether you have
|
||||||
|
* a value or a type, so tell TypeScript to enforce using
|
||||||
|
* `import type` instead of `import` for Types.
|
||||||
|
*/
|
||||||
|
"verbatimModuleSyntax": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"resolveJsonModule": true,
|
||||||
|
/**
|
||||||
|
* To have warnings / errors of the Svelte compiler at the
|
||||||
|
* correct position, enable source maps by default.
|
||||||
|
*/
|
||||||
|
"sourceMap": true,
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"skipLibCheck": true,
|
||||||
|
/**
|
||||||
|
* Typecheck JS in `.svelte` and `.js` files by default.
|
||||||
|
* Disable this if you'd like to use dynamic types.
|
||||||
|
*/
|
||||||
|
"checkJs": true
|
||||||
|
},
|
||||||
|
/**
|
||||||
|
* Use global.d.ts instead of compilerOptions.types
|
||||||
|
* to avoid limiting type declarations.
|
||||||
|
*/
|
||||||
|
"include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"]
|
||||||
|
}
|
||||||
1228
js/package-lock.json
generated
Normal file
1228
js/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load diff
22
js/package.json
Normal file
22
js/package.json
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
{
|
||||||
|
"name": "js",
|
||||||
|
"private": true,
|
||||||
|
"version": "0.0.0",
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"dev": "vite",
|
||||||
|
"build": "vite build",
|
||||||
|
"preview": "vite preview"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@sveltejs/vite-plugin-svelte": "^3.1.1",
|
||||||
|
"svelte": "^4.2.18",
|
||||||
|
"vite": "^5.3.4"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@vlcn.io/crsqlite-wasm": "^0.16.0",
|
||||||
|
"@vlcn.io/ws-browserdb": "^0.2.0",
|
||||||
|
"@vlcn.io/ws-client": "^0.2.0",
|
||||||
|
"@vlcn.io/xplat-api": "^0.15.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
1
js/public/vite.svg
Normal file
1
js/public/vite.svg
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
141
js/src/App.svelte
Normal file
141
js/src/App.svelte
Normal file
|
|
@ -0,0 +1,141 @@
|
||||||
|
<script lang="ts">
|
||||||
|
import { onMount } from 'svelte';
|
||||||
|
import initWasm from '@vlcn.io/crsqlite-wasm';
|
||||||
|
import wasmUrl from '@vlcn.io/crsqlite-wasm/crsqlite.wasm?url';
|
||||||
|
import { start } from "@vlcn.io/ws-client/worker.js";
|
||||||
|
import { createDbProvider } from "@vlcn.io/ws-browserdb";
|
||||||
|
|
||||||
|
let db;
|
||||||
|
let ws;
|
||||||
|
let todos = [];
|
||||||
|
let newTodo = '';
|
||||||
|
|
||||||
|
onMount(async () => {
|
||||||
|
const sqlite = await initWasm(() => wasmUrl);
|
||||||
|
db = await sqlite.open('todo.db');
|
||||||
|
|
||||||
|
await db.exec(`
|
||||||
|
DROP TABLE todos;
|
||||||
|
`);
|
||||||
|
await db.exec(`
|
||||||
|
CREATE TABLE IF NOT EXISTS todos (
|
||||||
|
id BLOB PRIMARY KEY NOT NULL,
|
||||||
|
content TEXT,
|
||||||
|
completed INTEGER NOT NULL DEFAULT 0
|
||||||
|
);
|
||||||
|
SELECT crsql_as_crr('todos');
|
||||||
|
`);
|
||||||
|
|
||||||
|
const config = {
|
||||||
|
dbProvider: createDbProvider(),
|
||||||
|
transportProvider: (dbName) => new WebSocket(`ws://localhost:8080/sync/${dbName}`),
|
||||||
|
};
|
||||||
|
|
||||||
|
start(config);
|
||||||
|
|
||||||
|
ws = new WebSocket('ws://localhost:8080/sync');
|
||||||
|
|
||||||
|
db.onUpdate(async () => {
|
||||||
|
const changes = await db.execA(`SELECT * FROM crsql_changes WHERE db_version > 0 AND site_id = crsql_site_id()`);
|
||||||
|
|
||||||
|
sendChangesToServer(changes);
|
||||||
|
});
|
||||||
|
|
||||||
|
ws.onmessage = async function(event) {
|
||||||
|
const { type, data } = JSON.parse(event.data);
|
||||||
|
if (type === 'changes') {
|
||||||
|
await applyChanges(data);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
loadTodos();
|
||||||
|
});
|
||||||
|
|
||||||
|
function sendChangesToServer(changes) {
|
||||||
|
const formattedChanges = changes.map(change => ({
|
||||||
|
TableName: change[0],
|
||||||
|
PK: Array.isArray(change[1]) ? btoa(change[1]) : btoa(change[1]),
|
||||||
|
ColumnName: change[2],
|
||||||
|
Value: Array.isArray(change[3]) ? btoa(String.fromCharCode.apply(null, change[3])) : btoa(change[3]),
|
||||||
|
ColVersion: Number(change[4]),
|
||||||
|
DBVersion: Number(change[5]),
|
||||||
|
SiteID: Array.isArray(change[6]) ? arrayBufferToBase64(Uint8Array.from(change[6]).buffer) : btoa(change[6]),
|
||||||
|
CL: Number(change[7]),
|
||||||
|
Seq: Number(change[8])
|
||||||
|
}));
|
||||||
|
console.log(formattedChanges)
|
||||||
|
|
||||||
|
const message = {
|
||||||
|
type: "changes",
|
||||||
|
data: formattedChanges
|
||||||
|
};
|
||||||
|
|
||||||
|
ws.send(JSON.stringify(message));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async function applyChanges(changes) {
|
||||||
|
await db.tx(async (tx) => {
|
||||||
|
for (const change of changes) {
|
||||||
|
await tx.exec(
|
||||||
|
`INSERT INTO crsql_changes VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||||
|
change
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadTodos() {
|
||||||
|
const result = await db.execO("SELECT * FROM todos ORDER BY id");
|
||||||
|
todos = result;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function addTodo() {
|
||||||
|
if (newTodo.trim()) {
|
||||||
|
await db.exec(`
|
||||||
|
INSERT INTO todos (id, content, completed)
|
||||||
|
VALUES (lower(hex(randomblob(16))), ?, 0)
|
||||||
|
`, [newTodo.trim()]);
|
||||||
|
newTodo = '';
|
||||||
|
loadTodos();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function toggleTodo(id) {
|
||||||
|
await db.exec(`
|
||||||
|
UPDATE todos
|
||||||
|
SET completed = NOT completed
|
||||||
|
WHERE id = ?
|
||||||
|
`, [id]);
|
||||||
|
loadTodos();
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<main>
|
||||||
|
<h1>Svelte Todo with cr-sqlite</h1>
|
||||||
|
<input
|
||||||
|
bind:value={newTodo}
|
||||||
|
on:keypress={(e) => e.key === 'Enter' && addTodo()}
|
||||||
|
placeholder="Add a new todo"
|
||||||
|
/>
|
||||||
|
<button on:click={addTodo}>Add Todo</button>
|
||||||
|
<ul>
|
||||||
|
{#each todos as todo}
|
||||||
|
<li>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={todo.completed}
|
||||||
|
on:change={() => toggleTodo(todo.id)}
|
||||||
|
/>
|
||||||
|
<span class:completed={todo.completed}>{todo.content}</span>
|
||||||
|
</li>
|
||||||
|
{/each}
|
||||||
|
</ul>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.completed {
|
||||||
|
text-decoration: line-through;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
79
js/src/app.css
Normal file
79
js/src/app.css
Normal file
|
|
@ -0,0 +1,79 @@
|
||||||
|
:root {
|
||||||
|
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
|
||||||
|
line-height: 1.5;
|
||||||
|
font-weight: 400;
|
||||||
|
|
||||||
|
color-scheme: light dark;
|
||||||
|
color: rgba(255, 255, 255, 0.87);
|
||||||
|
background-color: #242424;
|
||||||
|
|
||||||
|
font-synthesis: none;
|
||||||
|
text-rendering: optimizeLegibility;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
font-weight: 500;
|
||||||
|
color: #646cff;
|
||||||
|
text-decoration: inherit;
|
||||||
|
}
|
||||||
|
a:hover {
|
||||||
|
color: #535bf2;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
display: flex;
|
||||||
|
place-items: center;
|
||||||
|
min-width: 320px;
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
font-size: 3.2em;
|
||||||
|
line-height: 1.1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card {
|
||||||
|
padding: 2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
#app {
|
||||||
|
max-width: 1280px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 2rem;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
padding: 0.6em 1.2em;
|
||||||
|
font-size: 1em;
|
||||||
|
font-weight: 500;
|
||||||
|
font-family: inherit;
|
||||||
|
background-color: #1a1a1a;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.25s;
|
||||||
|
}
|
||||||
|
button:hover {
|
||||||
|
border-color: #646cff;
|
||||||
|
}
|
||||||
|
button:focus,
|
||||||
|
button:focus-visible {
|
||||||
|
outline: 4px auto -webkit-focus-ring-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: light) {
|
||||||
|
:root {
|
||||||
|
color: #213547;
|
||||||
|
background-color: #ffffff;
|
||||||
|
}
|
||||||
|
a:hover {
|
||||||
|
color: #747bff;
|
||||||
|
}
|
||||||
|
button {
|
||||||
|
background-color: #f9f9f9;
|
||||||
|
}
|
||||||
|
}
|
||||||
1
js/src/assets/svelte.svg
Normal file
1
js/src/assets/svelte.svg
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="26.6" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 308"><path fill="#FF3E00" d="M239.682 40.707C211.113-.182 154.69-12.301 113.895 13.69L42.247 59.356a82.198 82.198 0 0 0-37.135 55.056a86.566 86.566 0 0 0 8.536 55.576a82.425 82.425 0 0 0-12.296 30.719a87.596 87.596 0 0 0 14.964 66.244c28.574 40.893 84.997 53.007 125.787 27.016l71.648-45.664a82.182 82.182 0 0 0 37.135-55.057a86.601 86.601 0 0 0-8.53-55.577a82.409 82.409 0 0 0 12.29-30.718a87.573 87.573 0 0 0-14.963-66.244"></path><path fill="#FFF" d="M106.889 270.841c-23.102 6.007-47.497-3.036-61.103-22.648a52.685 52.685 0 0 1-9.003-39.85a49.978 49.978 0 0 1 1.713-6.693l1.35-4.115l3.671 2.697a92.447 92.447 0 0 0 28.036 14.007l2.663.808l-.245 2.659a16.067 16.067 0 0 0 2.89 10.656a17.143 17.143 0 0 0 18.397 6.828a15.786 15.786 0 0 0 4.403-1.935l71.67-45.672a14.922 14.922 0 0 0 6.734-9.977a15.923 15.923 0 0 0-2.713-12.011a17.156 17.156 0 0 0-18.404-6.832a15.78 15.78 0 0 0-4.396 1.933l-27.35 17.434a52.298 52.298 0 0 1-14.553 6.391c-23.101 6.007-47.497-3.036-61.101-22.649a52.681 52.681 0 0 1-9.004-39.849a49.428 49.428 0 0 1 22.34-33.114l71.664-45.677a52.218 52.218 0 0 1 14.563-6.398c23.101-6.007 47.497 3.036 61.101 22.648a52.685 52.685 0 0 1 9.004 39.85a50.559 50.559 0 0 1-1.713 6.692l-1.35 4.116l-3.67-2.693a92.373 92.373 0 0 0-28.037-14.013l-2.664-.809l.246-2.658a16.099 16.099 0 0 0-2.89-10.656a17.143 17.143 0 0 0-18.398-6.828a15.786 15.786 0 0 0-4.402 1.935l-71.67 45.674a14.898 14.898 0 0 0-6.73 9.975a15.9 15.9 0 0 0 2.709 12.012a17.156 17.156 0 0 0 18.404 6.832a15.841 15.841 0 0 0 4.402-1.935l27.345-17.427a52.147 52.147 0 0 1 14.552-6.397c23.101-6.006 47.497 3.037 61.102 22.65a52.681 52.681 0 0 1 9.003 39.848a49.453 49.453 0 0 1-22.34 33.12l-71.664 45.673a52.218 52.218 0 0 1-14.563 6.398"></path></svg>
|
||||||
|
After Width: | Height: | Size: 1.9 KiB |
10
js/src/lib/Counter.svelte
Normal file
10
js/src/lib/Counter.svelte
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
<script>
|
||||||
|
let count = 0
|
||||||
|
const increment = () => {
|
||||||
|
count += 1
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<button on:click={increment}>
|
||||||
|
count is {count}
|
||||||
|
</button>
|
||||||
8
js/src/main.js
Normal file
8
js/src/main.js
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
import './app.css'
|
||||||
|
import App from './App.svelte'
|
||||||
|
|
||||||
|
const app = new App({
|
||||||
|
target: document.getElementById('app'),
|
||||||
|
})
|
||||||
|
|
||||||
|
export default app
|
||||||
2
js/src/vite-env.d.ts
vendored
Normal file
2
js/src/vite-env.d.ts
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
/// <reference types="svelte" />
|
||||||
|
/// <reference types="vite/client" />
|
||||||
7
js/svelte.config.js
Normal file
7
js/svelte.config.js
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
|
||||||
|
|
||||||
|
export default {
|
||||||
|
// Consult https://svelte.dev/docs#compile-time-svelte-preprocess
|
||||||
|
// for more information about preprocessors
|
||||||
|
preprocess: vitePreprocess(),
|
||||||
|
}
|
||||||
17
js/vite.config.js
Normal file
17
js/vite.config.js
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
import { defineConfig } from 'vite'
|
||||||
|
import { svelte } from '@sveltejs/vite-plugin-svelte'
|
||||||
|
|
||||||
|
// https://vitejs.dev/config/
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [svelte()],
|
||||||
|
optimizeDeps: {
|
||||||
|
exclude: ['@vlcn.io/crsqlite-wasm'],
|
||||||
|
},
|
||||||
|
server: {
|
||||||
|
headers: {
|
||||||
|
'Cross-Origin-Opener-Policy': 'same-origin',
|
||||||
|
'Cross-Origin-Embedder-Policy': 'require-corp',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
263
main.go
263
main.go
|
|
@ -1,98 +1,231 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"encoding/base64"
|
||||||
"os"
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
|
||||||
tea "github.com/charmbracelet/bubbletea"
|
"mast/db"
|
||||||
_ "github.com/mattn/go-sqlite3"
|
|
||||||
"git.sealight.xyz/aynish/mast/db"
|
"github.com/charmbracelet/bubbles/textinput"
|
||||||
|
tea "github.com/charmbracelet/bubbletea"
|
||||||
|
uuid "github.com/gofrs/uuid"
|
||||||
|
"github.com/gorilla/websocket"
|
||||||
|
sqlite3 "github.com/mattn/go-sqlite3"
|
||||||
)
|
)
|
||||||
|
|
||||||
type model struct {
|
type model struct {
|
||||||
db *sql.DB
|
db *sql.DB
|
||||||
todos []string
|
conn *websocket.Conn
|
||||||
cursor int
|
todos []string
|
||||||
|
cursor int
|
||||||
|
textInput textinput.Model
|
||||||
|
inputting bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func initialModel() model {
|
func initialModel() model {
|
||||||
db, err := sql.Open("sqlite3", ":memory:")
|
sql.Register("sqlite3_with_extensions",
|
||||||
if err != nil {
|
&sqlite3.SQLiteDriver{
|
||||||
panic(err)
|
Extensions: []string{
|
||||||
}
|
"./db/crsqlite.so",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
db, err := sql.Open("sqlite3_with_extensions", "db.sqlite")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
err = RunMigrations(db)
|
err = mast.RunMigrations(db)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
m := model{
|
ti := textinput.New()
|
||||||
db: db,
|
ti.Placeholder = "Add a new todo"
|
||||||
todos: []string{},
|
ti.Focus()
|
||||||
cursor: 0,
|
|
||||||
}
|
conn, _, err := websocket.DefaultDialer.Dial("ws://localhost:8080/sync", nil)
|
||||||
m.loadTodos()
|
if err != nil {
|
||||||
return m
|
log.Println("Error connecting to WebSocket:", err)
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
m := model{
|
||||||
|
db: db,
|
||||||
|
conn: conn,
|
||||||
|
todos: []string{},
|
||||||
|
cursor: 0,
|
||||||
|
textInput: ti,
|
||||||
|
inputting: false,
|
||||||
|
}
|
||||||
|
m.loadTodos()
|
||||||
|
return m
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CRSQLChange struct {
|
||||||
|
TableName string
|
||||||
|
PK string
|
||||||
|
ColumnName string
|
||||||
|
Value string
|
||||||
|
ColVersion int64
|
||||||
|
DBVersion int64
|
||||||
|
SiteID string
|
||||||
|
CL int64
|
||||||
|
Seq int64
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
func (m *model) addTodo(todo string) {
|
func (m *model) addTodo(todo string) {
|
||||||
_, err := m.db.Exec("INSERT INTO todos (content) VALUES (?)", todo)
|
id, err := uuid.NewV7()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic("Error generating new UUID")
|
||||||
}
|
}
|
||||||
m.loadTodos()
|
_, err = m.db.Exec(`
|
||||||
|
INSERT INTO todos (id, content)
|
||||||
|
VALUES (?, ?)
|
||||||
|
`, id.String(), todo)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
rows, err := m.db.Query("SELECT * FROM crsql_changes")
|
||||||
|
if err != nil {
|
||||||
|
log.Println("Error querying crsql_changes:", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var changes []CRSQLChange
|
||||||
|
for rows.Next() {
|
||||||
|
var change CRSQLChange
|
||||||
|
var pkRaw []byte
|
||||||
|
var valueRaw []byte
|
||||||
|
var siteIDRaw []byte
|
||||||
|
err := rows.Scan(&change.TableName, &pkRaw, &change.ColumnName, &valueRaw,
|
||||||
|
&change.ColVersion, &change.DBVersion, &siteIDRaw, &change.CL, &change.Seq)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
log.Println("Error scanning change:", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
change.PK = base64.StdEncoding.EncodeToString(pkRaw)
|
||||||
|
change.Value = base64.StdEncoding.EncodeToString(valueRaw)
|
||||||
|
change.SiteID = base64.StdEncoding.EncodeToString(siteIDRaw)
|
||||||
|
|
||||||
|
|
||||||
|
changes = append(changes, change)
|
||||||
|
fmt.Println(change)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(changes) > 0 {
|
||||||
|
m.sendToWebSocket(changes)
|
||||||
|
}
|
||||||
|
|
||||||
|
m.loadTodos()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *model) loadTodos() {
|
func (m *model) sendToWebSocket(changes []CRSQLChange) {
|
||||||
rows, err := m.db.Query("SELECT content FROM todos")
|
message := struct {
|
||||||
if err != nil {
|
Type string `json:"type"`
|
||||||
panic(err)
|
Data []CRSQLChange `json:"data"`
|
||||||
|
}{
|
||||||
|
Type: "changes",
|
||||||
|
Data: changes,
|
||||||
}
|
}
|
||||||
defer rows.Close()
|
|
||||||
|
|
||||||
m.todos = []string{}
|
err := m.conn.WriteJSON(message)
|
||||||
for rows.Next() {
|
if err != nil {
|
||||||
var content string
|
log.Println("Error sending changes to WebSocket:", err)
|
||||||
if err := rows.Scan(&content); err != nil {
|
panic(err)
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
m.todos = append(m.todos, content)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func (m *model) loadTodos() {
|
||||||
|
rows, err := m.db.Query("SELECT content FROM todos")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
m.todos = []string{}
|
||||||
|
for rows.Next() {
|
||||||
|
var content string
|
||||||
|
if err := rows.Scan(&content); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
m.todos = append(m.todos, content)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (m model) Init() tea.Cmd {
|
func (m model) Init() tea.Cmd {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
switch msg := msg.(type) {
|
var cmd tea.Cmd
|
||||||
case tea.KeyMsg:
|
|
||||||
switch msg.String() {
|
switch msg := msg.(type) {
|
||||||
case "ctrl+c", "q":
|
case tea.KeyMsg:
|
||||||
return m, tea.Quit
|
switch msg.String() {
|
||||||
}
|
case "ctrl+c", "q":
|
||||||
}
|
return m, m.quit()
|
||||||
return m, nil
|
case "j", "down":
|
||||||
|
m.cursor = (m.cursor + 1) % len(m.todos)
|
||||||
|
case "k", "up":
|
||||||
|
m.cursor = (m.cursor - 1 + len(m.todos)) % len(m.todos)
|
||||||
|
case "a":
|
||||||
|
if !m.inputting {
|
||||||
|
m.inputting = true
|
||||||
|
return m, textinput.Blink
|
||||||
|
}
|
||||||
|
case "enter":
|
||||||
|
if m.inputting {
|
||||||
|
m.addTodo(m.textInput.Value())
|
||||||
|
m.textInput.Reset()
|
||||||
|
m.inputting = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if m.inputting {
|
||||||
|
m.textInput, cmd = m.textInput.Update(msg)
|
||||||
|
return m, cmd
|
||||||
|
}
|
||||||
|
|
||||||
|
return m, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m model) quit() tea.Cmd {
|
||||||
|
m.db.Close()
|
||||||
|
m.conn.Close()
|
||||||
|
return tea.Quit
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m model) View() string {
|
func (m model) View() string {
|
||||||
s := "Todo List:\n\n"
|
s := "Todo List:\n\n"
|
||||||
for i, todo := range m.todos {
|
for i, todo := range m.todos {
|
||||||
cursor := " "
|
cursor := " "
|
||||||
if m.cursor == i {
|
if m.cursor == i {
|
||||||
cursor = ">"
|
cursor = ">"
|
||||||
}
|
}
|
||||||
s += fmt.Sprintf("%s %s\n", cursor, todo)
|
s += fmt.Sprintf("%s %s\n", cursor, todo)
|
||||||
}
|
}
|
||||||
s += "\nPress q to quit.\n"
|
s += "\nPress 'a' to add a new todo, 'q' to quit.\n"
|
||||||
return s
|
|
||||||
|
if m.inputting {
|
||||||
|
s += "\n" + m.textInput.View()
|
||||||
|
}
|
||||||
|
|
||||||
|
return s
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
p := tea.NewProgram(initialModel())
|
p := tea.NewProgram(initialModel())
|
||||||
if _, err := p.Run(); err != nil {
|
if _, err := p.Run(); err != nil {
|
||||||
fmt.Printf("Alas, there's been an error: %v", err)
|
fmt.Printf("Alas, there's been an error: %v", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
210
server/main.go
Normal file
210
server/main.go
Normal file
|
|
@ -0,0 +1,210 @@
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
"encoding/base64"
|
||||||
|
|
||||||
|
"mast/db"
|
||||||
|
"github.com/gorilla/websocket"
|
||||||
|
sqlite3 "github.com/mattn/go-sqlite3"
|
||||||
|
)
|
||||||
|
|
||||||
|
var upgrader = websocket.Upgrader{
|
||||||
|
CheckOrigin: func(r *http.Request) bool {
|
||||||
|
return true
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
var db *sql.DB
|
||||||
|
var clients = make(map[*websocket.Conn]bool)
|
||||||
|
|
||||||
|
func handleWebSocket(w http.ResponseWriter, r *http.Request) {
|
||||||
|
conn, err := upgrader.Upgrade(w, r, nil)
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
for {
|
||||||
|
_, message, err := conn.ReadMessage()
|
||||||
|
if err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var msg struct {
|
||||||
|
Type string `json:"type"`
|
||||||
|
Data []interface{} `json:"data"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(message, &msg); err != nil {
|
||||||
|
log.Println("Error unmarshaling message:", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if msg.Type == "changes" {
|
||||||
|
fmt.Println("We're applying changes!!")
|
||||||
|
applyChanges(msg.Data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func printChange(change interface{}) {
|
||||||
|
// Attempt to type assert and print more details
|
||||||
|
if c, ok := change.(map[string]interface{}); ok {
|
||||||
|
for key, value := range c {
|
||||||
|
fmt.Printf(" %s: %v\n", key, value)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
fmt.Printf(" Not a map: %T\n", change)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func printChanges(changes []interface{}) {
|
||||||
|
for i, change := range changes {
|
||||||
|
fmt.Printf("Change %d: %+v\n", i, change)
|
||||||
|
printChange(change)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type CRSQLChange struct {
|
||||||
|
TableName string
|
||||||
|
PK []byte
|
||||||
|
ColumnName string
|
||||||
|
Value []byte
|
||||||
|
ColVersion int64
|
||||||
|
DBVersion int64
|
||||||
|
SiteID []byte
|
||||||
|
CL int64
|
||||||
|
Seq int64
|
||||||
|
}
|
||||||
|
|
||||||
|
func mapToCRSQLChange(m map[string]interface{}) (CRSQLChange, error) {
|
||||||
|
var err error
|
||||||
|
change := CRSQLChange{}
|
||||||
|
|
||||||
|
change.TableName = m["TableName"].(string)
|
||||||
|
change.ColumnName = m["ColumnName"].(string)
|
||||||
|
change.ColVersion = int64(m["ColVersion"].(float64))
|
||||||
|
change.DBVersion = int64(m["DBVersion"].(float64))
|
||||||
|
change.CL = int64(m["CL"].(float64))
|
||||||
|
change.Seq = int64(m["Seq"].(float64))
|
||||||
|
|
||||||
|
// Handle []byte fields
|
||||||
|
change.PK, err = base64.URLEncoding.DecodeString(m["PK"].(string))
|
||||||
|
if err != nil {
|
||||||
|
return change, err
|
||||||
|
}
|
||||||
|
//fmt.Println(m["PK"])
|
||||||
|
//fmt.Println(m["PK"].(string))
|
||||||
|
//fmt.Println(base64.URLEncoding.DecodeString(m["PK"].(string)))
|
||||||
|
change.Value, err = base64.URLEncoding.DecodeString(m["Value"].(string))
|
||||||
|
if err != nil {
|
||||||
|
return change, err
|
||||||
|
}
|
||||||
|
//change.SiteID, err = decodeBase64ToIntArray(m["SiteID"].(string))
|
||||||
|
change.SiteID, err = base64.URLEncoding.DecodeString(m["SiteID"].(string))
|
||||||
|
if err != nil {
|
||||||
|
return change, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return change, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func decodeBase64ToIntArray(encodedString string) ([]int, error) {
|
||||||
|
// Decode the base64 string
|
||||||
|
decodedBytes, err := base64.StdEncoding.DecodeString(encodedString)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("error decoding base64: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Convert bytes to string
|
||||||
|
decodedString := string(decodedBytes)
|
||||||
|
|
||||||
|
// Split the string by commas
|
||||||
|
stringSlice := strings.Split(decodedString, ",")
|
||||||
|
|
||||||
|
// Convert each string to an integer
|
||||||
|
intSlice := make([]int, len(stringSlice))
|
||||||
|
for i, s := range stringSlice {
|
||||||
|
num, err := strconv.Atoi(s)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("error converting string to int: %w", err)
|
||||||
|
}
|
||||||
|
intSlice[i] = num
|
||||||
|
}
|
||||||
|
|
||||||
|
return intSlice, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func applyChanges(changes []interface{}) {
|
||||||
|
tx, _ := db.Begin()
|
||||||
|
for i, change := range changes {
|
||||||
|
fmt.Println("Change number: ", i)
|
||||||
|
fmt.Println(change)
|
||||||
|
if changeMap, ok := change.(map[string]interface{}); ok {
|
||||||
|
c, err := mapToCRSQLChange(changeMap)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println("Error converting to CRSQLChange:", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
_, err = tx.Exec(`INSERT INTO crsql_changes VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||||
|
c.TableName, c.PK, c.ColumnName, c.Value, c.ColVersion, c.DBVersion, c.SiteID, c.CL, c.Seq)
|
||||||
|
if err != nil {
|
||||||
|
log.Println("Error inserting change:", err)
|
||||||
|
}
|
||||||
|
log.Println("We inserted data successfully??")
|
||||||
|
printChange(change)
|
||||||
|
} else {
|
||||||
|
fmt.Println("Not OK to convert change")
|
||||||
|
fmt.Println("Change look like:")
|
||||||
|
printChange(change)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tx.Commit()
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func broadcastChanges(sender *websocket.Conn, changes interface{}) {
|
||||||
|
for client := range clients {
|
||||||
|
if client != sender {
|
||||||
|
client.WriteJSON(map[string]interface{}{"type": "changes", "data": changes})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func main() {
|
||||||
|
var err error
|
||||||
|
val, err := base64.StdEncoding.DecodeString("MTY3LDU0LDQ5LDY3LDExMyw2MCw3NiwxMjAsMTU2LDExMCwyMjcsMTc2LDE4NCwyMjksMjQxLDE0Mw==")
|
||||||
|
decoded, _ := base64.StdEncoding.DecodeString("MTY3LDU0LDQ5LDY3LDExMyw2MCw3NiwxMjAsMTU2LDExMCwyMjcsMTc2LDE4NCwyMjksMjQxLDE0Mw==")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal("error:", err)
|
||||||
|
}
|
||||||
|
fmt.Printf("%q\n", val)
|
||||||
|
fmt.Printf("%q\n", decoded)
|
||||||
|
sql.Register("sqlite3_with_extensions",
|
||||||
|
&sqlite3.SQLiteDriver{
|
||||||
|
Extensions: []string{
|
||||||
|
"../db/crsqlite.so",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
db, err = sql.Open("sqlite3_with_extensions", "./todo.sqlite")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
err = mast.RunMigrations(db)
|
||||||
|
defer db.Close()
|
||||||
|
|
||||||
|
// Initialize database and tables...
|
||||||
|
http.HandleFunc("/sync", handleWebSocket)
|
||||||
|
log.Fatal(http.ListenAndServe(":8080", nil))
|
||||||
|
}
|
||||||
|
|
||||||
Loading…
Reference in a new issue