@cloud-cli/d0 1.0.3 → 1.2.0

package/.dockerignore

@@ -0,0 +1 @@
+.github/

package/Dockerfile

@@ -0,0 +1,4 @@
+FROM ghcr.io/cloud-cli/node:latest
+COPY --chown=node:node . /home/app
+RUN cd /home/app && npm i && npm run build && rm -r src/
+ENV NODE_ENV=production

package/README.md

@@ -7,19 +7,26 @@ SQLite server over HTTP
 **POST /query**
 
 Run a prepared SQLite statement.
-Send a JSON with two properties: `s` for statement and `d` for data (optional)
+Accepts a JSON with these properties:
+
+| Property | Description | Required |
+|-|:-:|-|
+|`s` | string with the statement | **yes** |
+|`d` | data to bind on a statement | no |
+|`m` | method to execute: `all`, `run` or `get`. Run is the default | no |
 
 ```js
-// using fetch
+// select all items using fetch
 fetch('https://db.example.com/query', {
   method: 'POST',
   body: JSON.stringify({
     s: 'SELECT * FROM user WHERE id = ?',
-    d: [123]
+    d: [123],
+    m: 'all',
   });
 });
 
-// using the server-provided library
+// select using the server-provided library
 import db from 'https://db.example.com/index.mjs';
 
 const user = await db.query('SELECT * FROM user WHERE id = ?', [123]);

package/client.mjs

@@ -1,12 +1,13 @@
 const baseURL = 'https://__API_URL__';
 
 export default {
-  async query(statement, data) {
+  async query(statement, data, method = 'run') {
     const req = await fetch(new URL('/query', baseURL), {
       method: 'POST',
       body: JSON.stringify({
         s: statement,
         d: data || null,
+        m: method,
       }),
     });
 

package/dist/index.d.ts

@@ -1,5 +1,13 @@
-/// <reference types="node" />
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { Database } from 'better-sqlite3';
+type Q = {
+    db: Database;
+    request: IncomingMessage;
+    response: ServerResponse;
+    args: Record<string, string>;
+};
 export declare function getDatabase(): Database;
 export declare function serve(): import("http").Server<typeof IncomingMessage, typeof ServerResponse>;
+export declare function handleRequest(request: any, response: any, db: any): Promise<void>;
+export declare function onQuery({ db, request, response }: Q): Promise<void>;
+export {};

package/dist/index.js

@@ -1,6 +1,7 @@
 import { createServer } from 'node:http';
 import { readFile } from 'node:fs/promises';
 import SQLite from 'better-sqlite3';
+const methods = ['all', 'run', 'get'];
 export function getDatabase() {
     const db = new SQLite(process.env.SQLITE_DB_PATH || './db.sqlite3');
     db.pragma('journal_mode = WAL');
@@ -8,33 +9,40 @@ export function getDatabase() {
 }
 export function serve() {
     const db = getDatabase();
-    const server = createServer((request, response) => {
-        const url = new URL(request.url, 'http://localhost');
-        const route = `${request.method} ${url.pathname}`.trim();
-        const args = Object.fromEntries(url.searchParams.entries());
-        const q = { db, request, response, args };
-        switch (route) {
-            case 'GET /index.mjs':
-                return onEsModule(q);
-            case 'POST /query':
-                return onQuery(q);
-            default:
-                response.writeHead(404).end();
-        }
-    });
+    const server = createServer((req, res) => handleRequest(req, res, db));
     server.listen(process.env.PORT);
     return server;
 }
-async function onQuery({ db, request, response }) {
-    const query = await readStream(request);
+export function handleRequest(request, response, db) {
+    const url = new URL(request.url, 'http://localhost');
+    const route = `${request.method} ${url.pathname}`.trim();
+    const args = Object.fromEntries(url.searchParams.entries());
+    const q = { db, request, response, args };
+    switch (route) {
+        case 'GET /index.mjs':
+            return onEsModule(q);
+        case 'POST /query':
+            return onQuery(q);
+        default:
+            response.writeHead(404).end();
+    }
+}
+export async function onQuery({ db, request, response }) {
+    const query = Buffer.concat(await request.toArray());
     if (!query.length) {
         response.writeHead(400).end();
         return;
     }
     try {
-        const { s, d } = JSON.parse(query);
+        const { s = '', d, m = 'run' } = JSON.parse(query.toString('utf-8'));
+        if (!s.trim()) {
+            throw new Error('Invalid statement.');
+        }
+        if (!methods.includes(m)) {
+            throw new Error('Invalid method. Must be one of ' + methods.join(', '));
+        }
         const runner = db.prepare(s);
-        const result = d ? runner.run(d) : runner.run();
+        const result = d ? runner[m](d) : runner[m]();
         response.end(JSON.stringify(result));
     }
     catch (error) {
@@ -59,11 +67,3 @@ async function onEsModule({ request, response }) {
     })
         .end(code.replace('__API_URL__', hostname));
 }
-function readStream(stream) {
-    return new Promise((resolve, reject) => {
-        const all = [];
-        stream.on('data', (c) => all.push(c));
-        stream.on('end', () => resolve(Buffer.concat(all).toString('utf8')));
-        stream.on('error', reject);
-    });
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/d0",
-  "version": "1.0.3",
+  "version": "1.2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
@@ -18,7 +18,7 @@
     "access": "public"
   },
   "dependencies": {
-    "better-sqlite3": "^9.4.3"
+    "better-sqlite3": "^11.0.0"
   },
   "devDependencies": {
     "@cloud-cli/prettier-config": "^1.0.0",