@midsummer-ai/sdk 0.1.0-next.1305 → 0.1.0-next.900

package/{connection-CxD_Nry5.mjs → connection-CDk7H1FL.mjs}

@@ -263,46 +263,6 @@ const SHARED = /* @__PURE__ */ new Map();
 *  window is admitted to the main LRU only if a count-min sketch (4 rows of 4-bit-ish counters, halved every 10x the
 *  size in accesses) says it is used more often than the main LRU's victim. `touch` every access (hit or miss), `add`
 *  a missed key: it returns the keys that left the cache (possibly the one leaving the window). */
-/**
-* Where a request to `url` goes, and the headers that name it. A `*.localhost` name is loopback (RFC 6761)
-* whatever the system's resolver says, and a Debian container's says nothing: outside a browser, which
-* resolves it itself and never lets a page set Host, it goes to 127.0.0.1 with the name as its Host
-* (and, over TLS, as the name the certificate is checked for). Anything else goes as it is.
-*   const { url, init } = loopback("http://db-a.localhost:8792/ws"); fetch(url, init)
-*/
-function loopback(url, g = globalThis) {
-	const at = new URL(url);
-	if (g.document !== void 0 || !at.hostname.endsWith(".localhost")) return {
-		url: String(url),
-		init: {}
-	};
-	const host = at.host, name = at.hostname;
-	at.hostname = "127.0.0.1";
-	return {
-		url: at.href,
-		init: {
-			headers: { Host: host },
-			.../^(https|wss):$/u.test(at.protocol) ? { tls: { serverName: name } } : {}
-		}
-	};
-}
-/** `fetch` of `url` through `loopback`, `init`'s headers kept beside its Host. */
-const fetchAt = (url, init = {}) => {
-	const to = loopback(url);
-	return to.init.headers ? fetch(to.url, {
-		...init,
-		...to.init,
-		headers: {
-			...Object.fromEntries(new Headers(init.headers ?? {})),
-			...to.init.headers
-		}
-	}) : fetch(to.url, init);
-};
-/** A WebSocket to `url` through `loopback`. */
-const socketAt = (url) => {
-	const to = loopback(url);
-	return to.init.headers ? new WebSocket(to.url, to.init) : new WebSocket(to.url);
-};
 var TinyLfu = class {
 	constructor(size, { windowShare = .01 } = {}) {
 		this.size = Math.max(2, Math.floor(size));
@@ -403,8 +363,8 @@ var Connection = class Connection {
 			...options,
 			shape
 		};
-		if (o.store === void 0 && typeof indexedDB !== "undefined" && typeof document !== "undefined") o.store = (await import("./store-DDuOr-_F.mjs")).idbStore(new URL(url).host);
-		if (o.tabs !== false && typeof document !== "undefined") return (await import("./tabs-4FLTfg1c.mjs")).ConnectionTabs.connect(url, o);
+		if (o.store === void 0 && typeof indexedDB !== "undefined" && typeof document !== "undefined") o.store = (await import("./store-BzI9at5x.mjs")).idbStore(new URL(url).host);
+		if (o.tabs !== false && typeof document !== "undefined") return (await import("./tabs-D-P8_ci_.mjs")).ConnectionTabs.connect(url, o);
 		return Connection.open(url, o);
 	}
 	/** A Connection over one socket, of the shape given (default "browser"), no detection (tabs.mjs opens its own so). */
@@ -557,7 +517,7 @@ var Connection = class Connection {
 		const exp = expOf(this.token);
 		if (!this.token || exp && exp * 1e3 - Date.now() < 6e4) return true;
 		try {
-			return (await fetchAt(this.url.replace(/^ws/u, "http"), { signal: AbortSignal.timeout(1e4) })).status === 401;
+			return (await fetch(this.url.replace(/^ws/u, "http"), { signal: AbortSignal.timeout(1e4) })).status === 401;
 		} catch {
 			return false;
 		}
@@ -583,7 +543,7 @@ var Connection = class Connection {
 	openOnce() {
 		return new Promise((ready, fail) => {
 			const dialed = this.dial ? Promise.resolve(this.dial(this)) : null;
-			const ws = dialed ? null : socketAt(this.url);
+			const ws = dialed ? null : new WebSocket(this.url);
 			const timer = setTimeout(() => {
 				fail(/* @__PURE__ */ new Error("open timeout"));
 				try {
@@ -1525,7 +1485,7 @@ var Connection = class Connection {
 	}
 	/** Stores a file (R2) and its `_files` row (owner: this user); resolves its id. */
 	async upload(blob, name) {
-		const put = () => fetchAt(`${this.base}/files?${this.auth()}&name=${encodeURIComponent(name)}`, {
+		const put = () => fetch(`${this.base}/files?${this.auth()}&name=${encodeURIComponent(name)}`, {
 			method: "PUT",
 			body: blob
 		});
@@ -1820,7 +1780,7 @@ var Connection = class Connection {
 			}
 			const home = this.homes.get(hk);
 			if (!home) return null;
-			const ws = socketAt(`${this.base.replace(/^http/u, "ws")}/ws?token=${encodeURIComponent(this.token)}&home=${encodeURIComponent(home)}`);
+			const ws = new WebSocket(`${this.base.replace(/^http/u, "ws")}/ws?token=${encodeURIComponent(this.token)}&home=${encodeURIComponent(home)}`);
 			lane = {
 				unit,
 				ws,

package/database/client.mjs

@@ -1,5 +1,5 @@
 import { DatabaseError } from "./errors.mjs";
-import { t as Connection } from "../connection-CxD_Nry5.mjs";
+import { t as Connection } from "../connection-CDk7H1FL.mjs";
 //#region src/database/client.ts
 /**
 * `@midsummer-ai/sdk/database`: a Project's Database, from its app or its server.
@@ -11,16 +11,16 @@ import { t as Connection } from "../connection-CxD_Nry5.mjs";
 *   const id = await db.mutation(api.messages.send, { channel: "general", body: "hi" })
 *   const stop = db.watch(api.messages.list, { channel: "general" }, (messages) => render(messages))
 *
-* Name a Database by the name its Environment binds it under, and no key is kept anywhere. The same
-* call works in a Deployment's server, whatever framework serves it, where the request's own handle
-* proves it; in a CI run or an Agent's run, where the run's Workload token does; and under
-* `midsummer dev`, where every binding reaches the Database's Stand-in.
+* In your Deployment's server, Midsummer hands in the Databases the Environment binds as
+* `context.database`: name one by its binding name, and no key is kept anywhere.
 *
-*   const db = await connect({ binding: "main" })
+*   const db = await connect({ database: context.database, binding: "main" })
 *
-* A server on Midsummer's own contract is also handed the handle as `context.database`:
+* In a CI run or an Agent's run, the run's Environment binds it the same way, and the run's own
+* Workload token is what proves it: no key there either. Under `midsummer dev`, every binding
+* reaches the Database's Stand-in.
 *
-*   const db = await connect({ database: context.database, binding: "main" })
+*   const db = await connect({ binding: "main" })
 *
 * From code outside Midsummer, a Database Key is enough: it is exchanged for a token, and again
 * before that token runs out.
@@ -61,14 +61,7 @@ async function connect(options) {
 		refresh = async () => (await options.database.token(options.binding)).token;
 	} else if ("binding" in options) {
 		const env = globalThis.process?.env ?? {};
-		const here = globalThis[Symbol.for("midsummer.context")];
-		const bound = here?.()?.database;
-		if (bound) {
-			const first = await bound.token(options.binding);
-			url = first.url;
-			token = first.token;
-			refresh = async () => (await bound.token(options.binding)).token;
-		} else if (env.MIDSUMMER_DATABASE_URL) {
+		if (env.MIDSUMMER_DATABASE_URL) {
 			url = env.MIDSUMMER_DATABASE_URL;
 			token = env.MIDSUMMER_DATABASE_TOKEN;
 		} else {

package/database/stand-in.d.mts

@@ -55,11 +55,8 @@ interface StandIn {
   close(): void;
 }
 /**
- * Writes a build's files under `folder` and loads them, each import of the surface naming this SDK's
- * `server.ts`. They reach it through a shim beside them, `_generated/server.mjs`, that re-exports the
- * module loaded here: a file on disk can't import one inside a compiled CLI, where this SDK's files
- * live only in the binary. Each load is a folder of its own, so a module loaded before never stands in
- * for a newer one.
+ * Writes a build's files under `folder` and loads them, each import of the surface naming this SDK.
+ * Each load is a folder of its own, so a module loaded before never stands in for a newer one.
  */
 declare function loadDatabase(built: Built, folder: string): Promise<Loaded>;
 /** A row as the Stand-in keeps it: its fields and its version, which counts its writes. */

package/database/stand-in.mjs

@@ -21,26 +21,18 @@ import { pathToFileURL } from "node:url";
 * The Project's code runs in this process, as it does on its author's machine. Crons do not run
 * here yet.
 */
-const SURFACE = /(\bfrom\s*)(["'])(@midsummer(?:-ai)?\/sdk\/server|\.\/_generated\/server(?:\.m?js)?)\2/gu;
-/** Where the loaded surface waits for the shim each load imports it through. */
-const HELD = Symbol.for("midsummer.database.surface");
+const SURFACE = /(\bfrom\s*)(["'])(@midsummer\/sdk\/server|\.\/_generated\/server(?:\.m?js)?)\2/gu;
 let loads = 0;
 /**
-* Writes a build's files under `folder` and loads them, each import of the surface naming this SDK's
-* `server.ts`. They reach it through a shim beside them, `_generated/server.mjs`, that re-exports the
-* module loaded here: a file on disk can't import one inside a compiled CLI, where this SDK's files
-* live only in the binary. Each load is a folder of its own, so a module loaded before never stands in
-* for a newer one.
+* Writes a build's files under `folder` and loads them, each import of the surface naming this SDK.
+* Each load is a folder of its own, so a module loaded before never stands in for a newer one.
 */
 async function loadDatabase(built, folder) {
-	const surface = await import("./server.mjs");
-	globalThis[HELD] = surface;
-	const names = Object.keys(surface).filter((name) => name !== "default" && /^[A-Za-z_$][\w$]*$/.test(name));
+	const server = new URL("./server.ts", import.meta.url).href;
 	const dir = join(folder, `load-${process.pid}-${loads += 1}`);
 	await mkdir(join(dir, "_generated"), { recursive: true });
 	await writeFile(join(dir, "_generated", "api.mjs"), built.generated["api.mjs"]);
-	await writeFile(join(dir, "_generated", "server.mjs"), `const surface = globalThis[Symbol.for("midsummer.database.surface")];\nexport const { ${names.join(", ")} } = surface;\n`);
-	for (const [name, text] of Object.entries(built.files)) await writeFile(join(dir, name), text.replace(SURFACE, (_all, from, quote) => `${from}${quote}./_generated/server.mjs${quote}`));
+	for (const [name, text] of Object.entries(built.files)) await writeFile(join(dir, name), text.replace(SURFACE, (_all, from, quote) => `${from}${quote}${server}${quote}`));
 	const functions = /* @__PURE__ */ new Map();
 	for (const fn of built.functions) {
 		const exported = (await import(pathToFileURL(join(dir, fn.file)).href))[fn.export];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midsummer-ai/sdk",
-  "version": "0.1.0-next.1305",
+  "version": "0.1.0-next.900",
   "license": "Apache-2.0",
   "type": "module",
   "description": "Midsummer's handles for an app's code: its Database, Storage, Queues, Vector DB, AI, Email and Agents, with stand-ins for tests.",

package/{store-DDuOr-_F.mjs → store-BzI9at5x.mjs}

@@ -1,4 +1,4 @@
-import "./connection-CxD_Nry5.mjs";
+import "./connection-CDk7H1FL.mjs";
 //#region src/database/client/store.mjs
 const STORES = [
 	"ops",

package/{tabs-4FLTfg1c.mjs → tabs-D-P8_ci_.mjs}

@@ -1,4 +1,4 @@
-import { t as Connection } from "./connection-CxD_Nry5.mjs";
+import { t as Connection } from "./connection-CDk7H1FL.mjs";
 //#region src/database/client/tabs.mjs
 /** Argument index of the options that take a `tag` (a tab tags its own writes: the same tag after a handover). */
 const TAGGED = {