@rip-lang/db 0.8.5 → 0.10.0

package/db.html

@@ -9,7 +9,8 @@
     h1 { margin: 0 0 20px; font-size: 24px; color: #fff; }
     .container { max-width: 1200px; margin: 0 auto; }
     textarea { width: 100%; height: 120px; padding: 12px; font-family: 'Monaco', 'Menlo', monospace; font-size: 14px; background: #16213e; color: #0f0; border: 1px solid #0f4c75; border-radius: 6px; resize: vertical; }
-    button { padding: 10px 24px; font-size: 14px; background: #0f4c75; color: #fff; border: none; border-radius: 6px; cursor: pointer; margin: 10px 10px 10px 0; }
+    .buttons { margin: 10px 0; }
+    button { padding: 10px 24px; font-size: 14px; background: #0f4c75; color: #fff; border: none; border-radius: 6px; cursor: pointer; margin-right: 10px; }
     button:hover { background: #1b6ca8; }
     .info { font-size: 12px; color: #888; margin-bottom: 10px; }
     .results { margin-top: 20px; }
@@ -29,48 +30,93 @@
     <h1>🦆 DuckDB Console</h1>
     <div class="info">Connected to: <span id="db">loading...</span></div>
     <textarea id="sql" placeholder="SELECT * FROM users LIMIT 10;">SELECT * FROM users;</textarea>
-    <div>
-      <button onclick="runQuery()">▶ Run (Cmd+Enter)</button>
-      <button onclick="showTables()">📋 Tables</button>
-      <button onclick="showStatus()">ℹ️ Status</button>
+    <div class="buttons">
+      <button onclick="run()">▶ Run (Cmd+Enter)</button>
+      <button onclick="tables()">📋 Tables</button>
+      <button onclick="status()">ℹ️ Status</button>
     </div>
     <div id="results" class="results"></div>
   </div>
   <script>
-    fetch('/status').then(r => r.json()).then(d => document.getElementById('db').textContent = d.database);
-    document.getElementById('sql').addEventListener('keydown', e => {
-      if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') runQuery();
+    const sqlEl = document.getElementById('sql');
+    const resultsEl = document.getElementById('results');
+
+    // Load status on startup
+    fetch('/status').then(r => r.json()).then(d => {
+      document.getElementById('db').textContent = d.database;
     });
-    async function runQuery() {
-      const sql = document.getElementById('sql').value.trim();
+
+    // Cmd+Enter to run
+    sqlEl.addEventListener('keydown', e => {
+      if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') {
+        e.preventDefault();
+        run();
+      }
+    });
+
+    function run() {
+      const sql = sqlEl.value.trim();
       if (!sql) return;
-      try {
-        const res = await fetch('/sql', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ sql }) });
-        renderResult(await res.json());
-      } catch (e) { renderError(e.message); }
+      fetch('/sql', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ sql })
+      })
+      .then(r => r.json())
+      .then(renderResult)
+      .catch(e => renderError(e.message));
     }
-    async function showTables() {
-      document.getElementById('sql').value = "SELECT table_name FROM information_schema.tables WHERE table_schema = 'main';";
-      runQuery();
+
+    function tables() {
+      sqlEl.value = "SELECT table_name FROM information_schema.tables WHERE table_schema = 'main';";
+      run();
     }
-    async function showStatus() {
-      try {
-        const data = await (await fetch('/status')).json();
-        document.getElementById('results').innerHTML = '<div style="background:#16213e;padding:16px;border-radius:6px;"><div><strong>Database:</strong> ' + data.database + '</div><div><strong>Tables:</strong> ' + (data.tables?.join(', ') || 'none') + '</div><div><strong>Time:</strong> ' + data.time + '</div></div>';
-      } catch (e) { renderError(e.message); }
+
+    function status() {
+      fetch('/status')
+        .then(r => r.json())
+        .then(data => {
+          resultsEl.innerHTML = `
+            <div style="background:#16213e;padding:16px;border-radius:6px;">
+              <div><strong>Database:</strong> ${data.database}</div>
+              <div><strong>Tables:</strong> ${data.tables?.join(', ') || 'none'}</div>
+              <div><strong>Time:</strong> ${data.time}</div>
+            </div>`;
+        })
+        .catch(e => renderError(e.message));
     }
+
     function renderResult(data) {
-      if (data.error) { renderError(data.error); return; }
-      if (!data.meta?.length) { document.getElementById('results').innerHTML = '<div class="meta"><span class="status ok">✓ OK</span> Query executed in ' + data.time + 's</div>'; return; }
+      if (data.error) {
+        renderError(data.error);
+        return;
+      }
+      if (!data.meta?.length) {
+        resultsEl.innerHTML = `<div class="meta"><span class="status ok">✓ OK</span> Query executed in ${data.time}s</div>`;
+        return;
+      }
       let html = '<table><tr>';
-      data.meta.forEach(col => { html += '<th>' + col.name + '<br><span style="font-weight:normal;font-size:11px;color:#888">' + col.type + '</span></th>'; });
+      data.meta.forEach(col => {
+        html += `<th>${col.name}<br><span style="font-weight:normal;font-size:11px;color:#888">${col.type}</span></th>`;
+      });
       html += '</tr>';
-      data.data.forEach(row => { html += '<tr>'; row.forEach(val => { html += '<td>' + (val === null ? '<span style="color:#666">NULL</span>' : val) + '</td>'; }); html += '</tr>'; });
-      html += '</table><div class="meta"><span class="status ok">✓ OK</span> ' + data.rows + ' row' + (data.rows !== 1 ? 's' : '') + ' in ' + data.time + 's</div>';
-      document.getElementById('results').innerHTML = html;
+      data.data.forEach(row => {
+        html += '<tr>';
+        row.forEach(val => {
+          html += `<td>${val === null ? '<span style="color:#666">NULL</span>' : val}</td>`;
+        });
+        html += '</tr>';
+      });
+      html += `</table><div class="meta"><span class="status ok">✓ OK</span> ${data.rows} row${data.rows !== 1 ? 's' : ''} in ${data.time}s</div>`;
+      resultsEl.innerHTML = html;
+    }
+
+    function renderError(msg) {
+      resultsEl.innerHTML = `<div class="error"><span class="status err">✗ Error</span> ${msg}</div>`;
     }
-    function renderError(msg) { document.getElementById('results').innerHTML = '<div class="error"><span class="status err">✗ Error</span> ' + msg + '</div>'; }
-    runQuery();
+
+    // Run initial query
+    run();
   </script>
 </body>
 </html>

package/db.rip

@@ -3,20 +3,24 @@
 # ==============================================================================
 #
 # A simple HTTP server for DuckDB queries. One server per database.
-# Compatible with the official DuckDB UI (duckdb -ui) via binary protocol.
+# Fully compatible with the official DuckDB UI!
 #
 # Usage:
 #   rip db.rip <database.duckdb> [--port 4000]
 #   rip db.rip :memory: --port 4000
 #
+# Then open http://localhost:4000/ for the official DuckDB UI!
+# (UI assets are proxied from ui.duckdb.org)
+#
 # Endpoints:
-#   POST /sql     - Execute SQL (query or mutation)
+#   GET  /        - Official DuckDB UI (proxied from ui.duckdb.org)
+#   GET  /ui      - Built-in SQL console (simple, no proxy)
+#   POST /sql     - Execute SQL (JSON API)
 #   POST /ddb/run - DuckDB UI binary protocol
-#   GET  /health  - Health check (always ok)
-#   GET  /status  - Database info and table list
-#   GET  /tables  - List all tables
-#   GET  /schema/:table - Get table schema
-#   GET  /ui      - Built-in SQL console
+#   GET  /health  - Health check
+#   GET  /status  - Database info
+#   GET  /tables  - List tables
+#   GET  /schema/:table - Table schema
 #
 # ==============================================================================
 
@@ -36,6 +40,14 @@ import {
 # Enable CORS for duck-ui and other clients
 use cors preflight: true
 
+# Log all requests
+use (c, next) ->
+  start = Date.now()
+  result = next!
+  ms = Date.now() - start
+  console.log "#{c.req.method} #{c.req.path} #{ms}ms"
+  result
+
 # ==============================================================================
 # Configuration
 # ==============================================================================
@@ -54,7 +66,7 @@ if '--help' in args or '-h' in args
       database    Path to DuckDB file (default: :memory:)
 
     Options:
-      --port=N    Port to listen on (default: 4000)
+      --port=N    Port to listen on (default: 4213)
       --help      Show this help
       --version   Show version
 
@@ -70,7 +82,7 @@ if '--help' in args or '-h' in args
       GET  /schema/:t   Get schema for table t
 
     Examples:
-      rip db.rip                    # In-memory database on port 4000
+      rip db.rip                    # In-memory database on port 4213
       rip db.rip mydb.duckdb        # File-based database
       rip db.rip :memory: --port=8080
 
@@ -85,7 +97,7 @@ if '--version' in args or '-v' in args
 
 # Support both env vars (for rip-server) and CLI args (for rip db.rip)
 path = process.env.DB_PATH or args.find((a) -> not a.startsWith('-')) or ':memory:'
-port = parseInt(process.env.DB_PORT or (args.find((a) -> a.startsWith('--port=')))?.split('=')[1]) or 4000
+port = parseInt(process.env.DB_PORT or (args.find((a) -> a.startsWith('--port=')))?.split('=')[1]) or 4213
 
 # Open database
 db = open(path)
@@ -97,7 +109,8 @@ console.log "rip-db: database=#{path} (bun-native)"
 
 # Extract column info from result
 getColumnInfo = (rows) ->
-  return { columns: [], types: [] } unless rows?.length > 0
+  if not rows?.length > 0
+    return { columns: [], types: [] }
   first = rows[0]
   columns = Object.keys(first)
   types = columns.map (col) ->
@@ -155,18 +168,18 @@ executeSQL = (sql, params = []) ->
 # ==============================================================================
 
 # POST / — duck-ui compatible (raw SQL in body)
-post '/', ->
-  sql = read().body
-  console.log "POST /", sql
-  return { error: 'Empty query' } unless sql?.trim()
+post '/' ->
+  sql = read 'body', 'string'
+  if not sql
+    return { error: 'Empty query' }
   executeSQL sql
 
 # POST /sql — JSON body with optional params
-post '/sql', ->
+post '/sql' ->
   { sql, params } = read()
-  console.log "POST /sql", sql, params or []
-  return { error: 'Missing required field: sql' } unless sql
-  executeSQL sql, params or []
+  if not sql
+    return { error: 'Missing required field: sql' }
+  executeSQL sql, (params or [])
 
 # GET /health — Simple health check (no DB query)
 get '/health', ->
@@ -239,15 +252,14 @@ get '/ui', -> new Response Bun.file(import.meta.dir + '/db.html')
 # ==============================================================================
 
 # POST /ddb/run — Execute SQL and return binary result (DuckDB UI protocol)
-post '/ddb/run', (req) ->
+post '/ddb/run' ->
   try
-    sql = req.text!
-    console.log "POST /ddb/run", sql?.slice?(0, 100) or sql
+    sql = read 'body', 'string'
+    if not sql
+      return binaryResponse serializeErrorResult 'Empty query'
 
-    return binaryResponse serializeErrorResult 'Empty query' unless sql?.trim()
-
-    # Parse result row limit from headers
-    rowLimit = parseInt(req.headers.get('x-duckdb-ui-result-row-limit') or '10000')
+    # Parse row limit from DuckDB UI header
+    rowLimit = parseInt(@req.header('x-duckdb-ui-result-row-limit') or '10000')
 
     # Execute query
     conn = db.connect()
@@ -270,9 +282,9 @@ post '/ddb/run', (req) ->
     finally
       conn.close()
 
-  catch error
-    console.error "POST /ddb/run error:", error.message
-    binaryResponse serializeErrorResult error.message or String(error)
+  catch err
+    console.error "POST /ddb/run error:", err?.message
+    binaryResponse serializeErrorResult err?.message or 'Unknown error'
 
 # POST /ddb/interrupt — Cancel running query
 post '/ddb/interrupt', ->
@@ -281,24 +293,110 @@ post '/ddb/interrupt', ->
   binaryResponse serializeEmptyResult()
 
 # POST /ddb/tokenize — Tokenize SQL for syntax highlighting
-post '/ddb/tokenize', (req) ->
-  sql = req.text! or ''
+post '/ddb/tokenize' ->
+  sql = read 'body', 'string'
   tokens = tokenizeSQL sql
   binaryResponse serializeTokenizeResult tokens
 
+# GET /version — Tell UI we're running in local/HTTP mode (not WASM)
+get '/version' ->
+  { origin: 'local', version: '139-944c08a214' }
+
+# GET /localToken — Return empty token for local mode (no MotherDuck)
+get '/localToken' ->
+  new Response '', { status: 200, headers: { 'Content-Type': 'text/plain' } }
+
 # GET /info — Server version info (DuckDB UI checks this)
-get '/info', (req, res) ->
-  res.headers.set 'Access-Control-Allow-Origin', '*'
-  res.headers.set 'X-DuckDB-Version', '1.2.1'  # Pretend to be DuckDB
-  res.headers.set 'X-DuckDB-Platform', 'rip-db'
-  res.headers.set 'X-DuckDB-UI-Extension-Version', VERSION
-  ''
+# The UI checks X-DuckDB-UI-Extension-Version to decide HTTP vs WASM mode
+# Version format must match desiredDuckDBUIExtensionVersions in /config
+get '/info' ->
+  @body '', 200,
+    'Access-Control-Allow-Origin': '*'
+    'X-DuckDB-Version': '1.4.1'
+    'X-DuckDB-Platform': 'rip-db'
+    'X-DuckDB-UI-Extension-Version': '139-944c08a214'
 
 # Helper to create binary response
 binaryResponse = (buffer) ->
   new Response buffer,
     headers: { 'Content-Type': 'application/octet-stream' }
 
+# ==============================================================================
+# DuckDB UI Proxy — Serve official UI assets from ui.duckdb.org
+# ==============================================================================
+#
+# The official DuckDB UI is a React app hosted at https://ui.duckdb.org
+# We proxy these assets so you can use the beautiful UI with rip-db!
+#
+# The UI makes API requests to relative URLs (/ddb/run, /ddb/tokenize, etc.)
+# which we handle above. This proxy just serves the static UI assets.
+#
+# ==============================================================================
+
+UI_REMOTE_URL = 'https://ui.duckdb.org'
+
+# GET /localEvents — Server-sent events for catalog updates
+get '/localEvents' ->
+  # Create SSE response with keep-alive
+  encoder = new TextEncoder()
+  intervalId = null
+
+  stream = new ReadableStream
+    start: (controller) ->
+      # Send initial connection event
+      controller.enqueue encoder.encode "event: connected\ndata: {}\n\n"
+
+      # Keep connection alive with periodic heartbeats
+      intervalId = setInterval ->
+        try
+          controller.enqueue encoder.encode ": heartbeat\n\n"
+        catch
+          clearInterval intervalId
+      , 30000
+
+    cancel: ->
+      clearInterval intervalId if intervalId
+
+  new Response stream,
+    headers:
+      'Content-Type': 'text/event-stream'
+      'Cache-Control': 'no-cache'
+      'Connection': 'keep-alive'
+
+# GET /* — Proxy UI assets from ui.duckdb.org (catch-all, must be last)
+get '/*' ->
+  path = @req.path
+
+  # Skip if this is one of our API endpoints (shouldn't reach here, but safety)
+  return { error: 'Not found' } if path in ['/health', '/status', '/tables', '/info', '/ui']
+
+  try
+    # Fetch from remote UI server
+    response = fetch! "#{UI_REMOTE_URL}#{path}",
+      headers:
+        'User-Agent': "rip-db/#{VERSION}"
+
+    # Get response body and content type
+    body = response.arrayBuffer!
+    contentType = response.headers.get('Content-Type') or 'application/octet-stream'
+
+    # Build response headers
+    headers =
+      'Content-Type': contentType
+      'Cache-Control': response.headers.get('Cache-Control') or 'public, max-age=3600'
+
+    # For /config endpoint, add DuckDB version headers (UI uses these to detect mode)
+    if path is '/config'
+      headers['X-DuckDB-Version'] = '1.4.1'
+      headers['X-DuckDB-Platform'] = 'rip-db'
+      headers['X-DuckDB-UI-Extension-Version'] = '139-944c08a214'
+
+    new Response body, { status: response.status, headers }
+
+  catch err
+    console.error "Proxy error for #{path}:", err?.message
+    new Response "Failed to fetch UI asset: #{path}", { status: 502 }
+
 # ==============================================================================
 # Start Server
 # ==============================================================================
@@ -306,4 +404,5 @@ binaryResponse = (buffer) ->
 start port: port
 
 console.log "rip-db: listening on http://localhost:#{port}"
-console.log "rip-db: POST /sql, POST /ddb/run, GET /health, GET /status, GET /tables, GET /schema/:table, GET /ui"
+console.log "rip-db: Official DuckDB UI available at http://localhost:#{port}/"
+console.log "rip-db: Built-in console at http://localhost:#{port}/ui"

package/lib/duckdb-binary.rip

@@ -229,28 +229,25 @@ serializeVector = (s, column, values) ->
     s.writeFieldId 101
     s.writeData createValidityBitmap values
 
-  # Type IDs: VARCHAR=25, CHAR=24, BOOLEAN=10, TINYINT=11, UTINYINT=28,
-  # SMALLINT=12, USMALLINT=29, INTEGER=13, UINTEGER=30, BIGINT=14, UBIGINT=31,
-  # FLOAT=22, DOUBLE=23, DATE=15, TIMESTAMP=19, TIMESTAMP_TZ=32
   switch typeId
-    when 25, 24  # VARCHAR, CHAR
+    when LogicalTypeId.VARCHAR, LogicalTypeId.CHAR
       s.writeList 102, values, (s, v) -> s.writeString String(v ? '')
 
-    when 10  # BOOLEAN
+    when LogicalTypeId.BOOLEAN
       s.writeFieldId 102
       bytes = new Uint8Array values.length
       for v, i in values
         bytes[i] = if v then 1 else 0
       s.writeData bytes
 
-    when 11, 28  # TINYINT, UTINYINT
+    when LogicalTypeId.TINYINT, LogicalTypeId.UTINYINT
       s.writeFieldId 102
       bytes = new Uint8Array values.length
       for v, i in values
         bytes[i] = (v ? 0) & 0xFF
       s.writeData bytes
 
-    when 12  # SMALLINT
+    when LogicalTypeId.SMALLINT
       s.writeFieldId 102
       bytes = new Uint8Array values.length * 2
       dv = new DataView bytes.buffer
@@ -258,7 +255,7 @@ serializeVector = (s, column, values) ->
         dv.setInt16 i * 2, v ? 0, true
       s.writeData bytes
 
-    when 29  # USMALLINT
+    when LogicalTypeId.USMALLINT
       s.writeFieldId 102
       bytes = new Uint8Array values.length * 2
       dv = new DataView bytes.buffer
@@ -266,7 +263,7 @@ serializeVector = (s, column, values) ->
         dv.setUint16 i * 2, v ? 0, true
       s.writeData bytes
 
-    when 13  # INTEGER
+    when LogicalTypeId.INTEGER
       s.writeFieldId 102
       bytes = new Uint8Array values.length * 4
       dv = new DataView bytes.buffer
@@ -274,7 +271,7 @@ serializeVector = (s, column, values) ->
         dv.setInt32 i * 4, v ? 0, true
       s.writeData bytes
 
-    when 30  # UINTEGER
+    when LogicalTypeId.UINTEGER
       s.writeFieldId 102
       bytes = new Uint8Array values.length * 4
       dv = new DataView bytes.buffer
@@ -282,7 +279,7 @@ serializeVector = (s, column, values) ->
         dv.setUint32 i * 4, v ? 0, true
       s.writeData bytes
 
-    when 14  # BIGINT
+    when LogicalTypeId.BIGINT
       s.writeFieldId 102
       bytes = new Uint8Array values.length * 8
       dv = new DataView bytes.buffer
@@ -290,7 +287,7 @@ serializeVector = (s, column, values) ->
         dv.setBigInt64 i * 8, BigInt(v ? 0), true
       s.writeData bytes
 
-    when 31  # UBIGINT
+    when LogicalTypeId.UBIGINT
       s.writeFieldId 102
       bytes = new Uint8Array values.length * 8
       dv = new DataView bytes.buffer
@@ -298,7 +295,7 @@ serializeVector = (s, column, values) ->
         dv.setBigUint64 i * 8, BigInt(v ? 0), true
       s.writeData bytes
 
-    when 22  # FLOAT
+    when LogicalTypeId.FLOAT
       s.writeFieldId 102
       bytes = new Uint8Array values.length * 4
       dv = new DataView bytes.buffer
@@ -306,7 +303,7 @@ serializeVector = (s, column, values) ->
         dv.setFloat32 i * 4, v ? 0, true
       s.writeData bytes
 
-    when 23  # DOUBLE
+    when LogicalTypeId.DOUBLE
       s.writeFieldId 102
       bytes = new Uint8Array values.length * 8
       dv = new DataView bytes.buffer
@@ -314,7 +311,7 @@ serializeVector = (s, column, values) ->
         dv.setFloat64 i * 8, v ? 0, true
       s.writeData bytes
 
-    when 15  # DATE
+    when LogicalTypeId.DATE
       s.writeFieldId 102
       bytes = new Uint8Array values.length * 4
       dv = new DataView bytes.buffer
@@ -323,7 +320,7 @@ serializeVector = (s, column, values) ->
         dv.setInt32 i * 4, days, true
       s.writeData bytes
 
-    when 19, 32  # TIMESTAMP, TIMESTAMP_TZ
+    when LogicalTypeId.TIMESTAMP, LogicalTypeId.TIMESTAMP_TZ
       s.writeFieldId 102
       bytes = new Uint8Array values.length * 8
       dv = new DataView bytes.buffer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rip-lang/db",
-  "version": "0.8.5",
+  "version": "0.10.0",
   "description": "DuckDB Server — Simple HTTP API for DuckDB queries",
   "type": "module",
   "main": "db.rip",
@@ -12,9 +12,6 @@
     "dev": "rip db.rip :memory:",
     "test": "bun test"
   },
-  "dependencies": {
-    "@rip-lang/api": "^0.5.0"
-  },
   "keywords": [
     "db",
     "database",