quick silver

cli/build-cmd.test.ts

@@ -235,6 +235,9 @@ it("unmodified dependencies", async () => {
   expect(patchedPjson.patchedPackageJson).toEqual({
     scripts: {},
     version: "1.2.3",
+    publishConfig: {
+      access: "public",
+    },
     dependencies: {
       "@fireproof/vendor": "workspace:*",
       "xcmd-ts": "^0.13.0",
@@ -244,6 +247,24 @@ it("unmodified dependencies", async () => {
   });
 });
 
+it("patchPackageJson sets repository when repositoryUrl is provided", async () => {
+  const version = new Version("1.2.3", "");
+  const { patchedPackageJson } = await patchPackageJson("package.json", version, {
+    mock,
+    repositoryUrl: "https://github.com/fireproof-storage/fireproof.git",
+  });
+  expect(patchedPackageJson.repository).toEqual({
+    type: "git",
+    url: "https://github.com/fireproof-storage/fireproof.git",
+  });
+});
+
+it("patchPackageJson does not set repository when repositoryUrl is omitted", async () => {
+  const version = new Version("1.2.3", "");
+  const { patchedPackageJson } = await patchPackageJson("package.json", version, { mock });
+  expect(patchedPackageJson.repository).toBeUndefined();
+});
+
 it("sanitizeNpmrc with http lhs", async () => {
   const npmrc = [
     "; .npmrc",

cli/build-cmd.ts

@@ -122,10 +122,13 @@ export interface PackageJson {
   exports: Record<string, string | Record<string, string>>;
   dependencies: Record<string, string>;
   devDependencies: Record<string, string>;
+  publishConfig?: Record<string, string>;
+  repository?: { type: string; url: string } | string;
 }
 
 export interface PatchPackageJsonOptions {
   changeScope?: string;
+  repositoryUrl?: string;
   readonly mock?: {
     readonly readJSON: typeof fs.readJson;
   };
@@ -155,6 +158,10 @@ export async function patchPackageJson(
   patchedPackageJson.version = version.version;
   delete patchedPackageJson.scripts["pack"];
   delete patchedPackageJson.scripts["publish"];
+  patchedPackageJson.publishConfig = { ...patchedPackageJson.publishConfig, access: "public" };
+  if (opts.repositoryUrl) {
+    patchedPackageJson.repository = { type: "git", url: opts.repositoryUrl };
+  }
 
   return { patchedPackageJson, originalPackageJson };
 }
@@ -319,6 +326,14 @@ export async function buildJsrConf(
   return jsrConf;
 }
 
+export async function getGitOriginUrl(): Promise<string> {
+  const res = await $`git config --get remote.origin.url`.nothrow();
+  if (res.exitCode !== 0) {
+    return "";
+  }
+  return res.stdout.trim();
+}
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function buildCmd(sthis: SuperThis) {
   const cmd = command({
@@ -476,6 +491,12 @@ export function buildCmd(sthis: SuperThis) {
         defaultValueIsSerializable: true,
         description: "Package manager to use (pnpm, npm, yarn, bun), defaults to 'pnpm'.",
       }),
+      repositoryUrl: option({
+        long: "repository-url",
+        type: string,
+        defaultValue: () => "",
+        description: "The repository URL to set in package.json. Defaults to the origin URL read from .git/config.",
+      }),
     },
     handler: async (args) => {
       const top = await findUp("tsconfig.dist.json");
@@ -546,7 +567,14 @@ export function buildCmd(sthis: SuperThis) {
       $.verbose = true;
       cd(jsrDstDir);
 
-      let packageJson = await patchPackageJson("package.json", version, { changeScope: args.changeScope });
+      if (!args.repositoryUrl) {
+        args.repositoryUrl = await getGitOriginUrl();
+      }
+
+      let packageJson = await patchPackageJson("package.json", version, {
+        changeScope: args.changeScope,
+        repositoryUrl: args.repositoryUrl,
+      });
       if (!args.noPinned) {
         console.log(
           "Prepared package.json with pinning for",

cloud/3rd-party/package.json

@@ -45,6 +45,7 @@
     "@fireproof/core-keybag": "workspace:*",
     "@fireproof/core-protocols-dashboard": "workspace:*",
     "@fireproof/core-runtime": "workspace:*",
+    "@fireproof/core-quick-silver": "workspace:*",
     "@fireproof/core-types-protocols-cloud": "workspace:*",
     "@fireproof/core-types-protocols-dashboard": "workspace:*",
     "jose": "^6.1.3",

cloud/3rd-party/src/App.tsx

@@ -1,26 +1,30 @@
-import { DocWithId, useFireproof, toCloud, RedirectStrategy } from "use-fireproof";
+import { DocWithId, useFireproof } from "use-fireproof";
 import React, { useState, useEffect } from "react";
 import "./App.css";
+import { QuickSilver } from "../../../core/quick-silver/quick-silver.js";
 // import { URI } from "@adviser/cement";
 
 function App() {
   const { database, attach } = useFireproof("fireproof-5-party", {
-    attach: toCloud({
-      strategy: new RedirectStrategy({
-        //   overlayCss: defaultOverlayCss,
-        overlayHtml: (url: string) => `<div class="fpOverlayContent">
-          <div class="fpCloseButton">&times;</div>
-          Fireproof Dashboard<br />
-          Sign in to Fireproof Dashboard
-          <a href="${url}" target="_blank">Redirect to Fireproof</a>
-        </div>`,
-      }),
-      // dashboardURI: "http://localhost:7370/fp/cloud/api/token",
-      // tokenApiURI: "http://localhost:7370/api",
-      // urls: { base: "fpcloud://localhost:8787?protocol=ws" },
-      // tenant: "3rd-party",
-      // ledger: "vibes",
-    }),
+    databaseFactory: (name) => {
+      return new QuickSilver({ name });
+    },
+    // attach: toCloud({
+    //   strategy: new RedirectStrategy({
+    //     //   overlayCss: defaultOverlayCss,
+    //     overlayHtml: (url: string) => `<div class="fpOverlayContent">
+    //       <div class="fpCloseButton">&times;</div>
+    //       Fireproof Dashboard<br />
+    //       Sign in to Fireproof Dashboard
+    //       <a href="${url}" target="_blank">Redirect to Fireproof</a>
+    //     </div>`,
+    //   }),
+    // dashboardURI: "http://localhost:7370/fp/cloud/api/token",
+    // tokenApiURI: "http://localhost:7370/api",
+    // urls: { base: "fpcloud://localhost:8787?protocol=ws" },
+    // tenant: "3rd-party",
+    // ledger: "vibes",
+    // }),
   });
   const [rows, setRows] = useState([] as DocWithId<{ value: string }>[]);
   // const [token, setToken] = useState("");

cloud/quick-silver/api/cli.ts

@@ -0,0 +1,161 @@
+/* eslint-disable no-console */
+import { command, option, multioption, string, run, subcommands, array } from "cmd-ts";
+import { QSApi } from "./qs-api.js";
+import type { QSGet, QSPut } from "@fireproof/cloud-quick-silver-types";
+import { ensureSuperThis } from "@fireproof/core-runtime";
+import { processStream } from "@adviser/cement";
+
+const sthis = ensureSuperThis();
+
+// ── shared connection options ─────────────────────────────────────────────────
+
+function connectionOpts() {
+  return {
+    url: option({
+      long: "url",
+      short: "u",
+      description: "WebSocket URL of the quick-silver worker",
+      type: string,
+    }),
+    db: option({
+      long: "db",
+      short: "d",
+      description: "Database name",
+      type: string,
+    }),
+    authType: option({
+      long: "auth-type",
+      description: "Auth type",
+      type: string,
+      defaultValue: () => "anon",
+    }),
+    authToken: option({
+      long: "auth-token",
+      short: "t",
+      description: "Auth token",
+      type: string,
+      defaultValue: () => "",
+    }),
+  };
+}
+
+function makeApi(args: { url: string; db: string; authType: string; authToken: string }): ReturnType<typeof QSApi> {
+  return QSApi({
+    url: args.url,
+    db: args.db,
+    auth: () => ({ type: args.authType, token: args.authToken }),
+  });
+}
+
+// ── get ───────────────────────────────────────────────────────────────────────
+
+const getCmd = command({
+  name: "get",
+  description: "Fetch one or more docs by key (comma-separated)",
+  args: {
+    ...connectionOpts(),
+    keys: multioption({
+      long: "keys",
+      short: "k",
+      description: "Key to fetch (repeatable)",
+      type: array(string),
+    }),
+  },
+  handler: async (args) => {
+    const api = await makeApi(args);
+    const ops: QSGet[] = args.keys.map((key) => ({ key }));
+    await processStream(api.get(ops), async (r) => {
+      console.log(JSON.stringify(r));
+    });
+    await api.close();
+  },
+});
+
+// ── put ───────────────────────────────────────────────────────────────────────
+
+const putCmd = command({
+  name: "put",
+  description: "Write docs by key (repeatable: --pkg key,{json})",
+  args: {
+    ...connectionOpts(),
+    pkg: multioption({
+      long: "pkg",
+      short: "p",
+      description: "key,{json} pair to store (repeatable)",
+      type: array(string),
+    }),
+  },
+  handler: async (args) => {
+    const ops: QSPut[] = args.pkg.map((pair) => {
+      const comma = pair.indexOf(",");
+      if (comma === -1) throw new Error(`invalid --pkg "${pair}": expected key,{json}`);
+      const key = pair.slice(0, comma);
+      const data = sthis.ende.cbor.encodeToUint8(JSON.parse(pair.slice(comma + 1))) as Uint8Array<ArrayBuffer>;
+      return { key, data } satisfies QSPut;
+    });
+    const api = await makeApi(args);
+    await processStream(api.put(ops), async (r) => {
+      console.log(JSON.stringify(r));
+    });
+    await api.close();
+  },
+});
+
+// ── all ───────────────────────────────────────────────────────────────────────
+
+const queryCmd = command({
+  name: "query",
+  description: "Stream all docs in the database",
+  args: {
+    ...connectionOpts(),
+  },
+  handler: async (args) => {
+    const api = await makeApi(args);
+    await processStream(api.query(), async (r) => {
+      console.log(JSON.stringify(r));
+    });
+    await api.close();
+  },
+});
+
+// ── subscribe ─────────────────────────────────────────────────────────────────
+
+const subscribeCmd = command({
+  name: "subscribe",
+  description: "Subscribe to events for a subscribeId (streams until Ctrl+C)",
+  args: {
+    ...connectionOpts(),
+  },
+  handler: async (args) => {
+    const api = await makeApi(args);
+    const handle = api.subscribe();
+
+    const cleanup = () => {
+      handle.close();
+      api
+        .close()
+        .then(() => process.exit(0))
+        .catch(() => process.exit(1));
+    };
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
+
+    await processStream(handle.events, async (r) => {
+      console.log(JSON.stringify(r));
+    });
+    await api.close();
+  },
+});
+
+// ── entry point ───────────────────────────────────────────────────────────────
+
+const cmd = subcommands({
+  name: "qs",
+  description: "quick-silver CLI",
+  version: "0.0.0",
+  cmds: { get: getCmd, put: putCmd, query: queryCmd, subscribe: subscribeCmd },
+});
+
+run(cmd, process.argv.slice(2))
+  .then(() => process.exit(0))
+  .catch(console.error);

cloud/quick-silver/api/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "@fireproof/cloud-quick-silver-api",
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "build": "core-cli tsc",
+    "pack": "core-cli build --doPack",
+    "publish": "core-cli build"
+  },
+  "dependencies": {
+    "@adviser/cement": "^0.5.22",
+    "@fireproof/cloud-quick-silver-types": "workspace:*",
+    "@fireproof/core-runtime": "workspace:*",
+    "cmd-ts": "^0.15.0"
+  }
+}