@cloud-cli/d0 1.3.0 → 1.3.1

package/Dockerfile

@@ -1,5 +1,8 @@
 FROM ghcr.io/cloud-cli/node:latest
+
 USER root
+WORKDIR /home/app
 COPY . /home/app
+RUN npm i && npm run build && rm -r src/ node_modules/ && npm cache clean --force
 ENV NODE_ENV=production
-RUN cd /home/app && npm i && npm run build && rm -r src/
+RUN npm install --omit=dev && npm cache clean --force

package/client.mjs

@@ -1,20 +1,32 @@
-const baseURL = 'https://__API_URL__';
+const baseURL = "https://__API_URL__";
 
-export default {
-  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,
-      }),
-    });
+export async function 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,
+    }),
+  });
 
-    if (req.ok) {
-      return await req.json();
-    }
+  if (req.ok) {
+    return await req.json();
+  }
 
-    throw new Error(await req.text());
-  },
-};
+  throw new Error(await req.text());
+}
+
+export function get(statement, data) {
+  return query(statement, data, "get");
+}
+
+export function run(statement, data) {
+  return query(statement, data, "run");
+}
+
+export function all(statement, data) {
+  return query(statement, data, "all");
+}
+
+export default { query, get, run, all };

package/dist/index.d.ts

@@ -1,13 +1,13 @@
 import { IncomingMessage, ServerResponse } from "node:http";
 import { Database } from "better-sqlite3";
-type Q = {
-    db: Database;
+type Query = {
+    db: string;
     request: IncomingMessage;
     response: ServerResponse;
     args: Record<string, string>;
 };
-export declare function getDatabase(file?: string): 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 declare function getDatabase(file: string): Database;
+export declare function serve(): Promise<any>;
+export declare function handleRequest(request: IncomingMessage, response: ServerResponse, db: string): Promise<void>;
+export declare function onQuery({ db, request, response }: Query): Promise<void>;
 export {};

package/dist/index.js

@@ -1,30 +1,28 @@
-import { createServer } from "node:http";
 import { readFile } from "node:fs/promises";
 import SQLite from "better-sqlite3";
 import { join } from "node:path";
+import createServer from "@cloud-cli/http";
 const methods = ["all", "run", "get"];
 const baseDomain = process.env.BASE_DOMAIN;
 const dataPath = process.env.DATA_PATH || join(import.meta.dirname, "data");
-export function getDatabase(file = "db.sqlite3") {
+export function getDatabase(file) {
     const fullPath = join(dataPath, file);
     const db = new SQLite(fullPath);
     db.pragma("journal_mode = WAL");
     return db;
 }
 export function serve() {
-    const db = getDatabase();
-    const server = createServer((req, res) => {
-        if (baseDomain) {
+    if (baseDomain) {
+        return createServer((req, res) => {
             const hostname = String(req.headers["x-forwarded-for"] || "");
             const subdomain = hostname.replace(baseDomain, "").replace(".", "");
             if (subdomain) {
-                return handleRequest(req, res, getDatabase(subdomain + ".sqlite3"));
+                return handleRequest(req, res, subdomain + ".sqlite3");
             }
-        }
-        handleRequest(req, res, db);
-    });
-    server.listen(process.env.PORT);
-    return server;
+            res.writeHead(400).end();
+        });
+    }
+    return createServer((req, res) => handleRequest(req, res, "db.sqlite3"));
 }
 export function handleRequest(request, response, db) {
     const url = new URL(request.url, "http://localhost");
@@ -54,7 +52,8 @@ export async function onQuery({ db, request, response }) {
         if (!methods.includes(m)) {
             throw new Error("Invalid method. Must be one of " + methods.join(", "));
         }
-        const runner = db.prepare(s);
+        const sqlite = getDatabase(db);
+        const runner = sqlite.prepare(s.trim());
         const result = d ? runner[m](d) : runner[m]();
         response.end(JSON.stringify(result));
     }
@@ -71,7 +70,7 @@ async function getFile() {
     return file;
 }
 async function onEsModule({ request, response }) {
-    const hostname = request.headers["x-forwarded-for"];
+    const hostname = String(request.headers["x-forwarded-for"]);
     const code = await getFile();
     response
         .writeHead(200, {

package/package.json

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