@hitch42/applet 0.1.1-beta.8 → 0.1.1-beta.9

package/dist/{init-jDEgYIXg.js → init-6oGPM46R.js}

@@ -1,8 +1,8 @@
-import { a as ORG_CODE_PATTERN, i as APPLET_CODE_PATTERN } from "./manifest-Bp87Uz0a.js";
-import { d as resolveInstanceUrl, i as readWorkspaceConfig, u as resolveAuthForOrg } from "./workspace-XVtM12ZC.js";
-import { n as runGenerate } from "./generate-BxYHdoAQ.js";
-import { n as loadAppletSourceDefinition } from "./load-config-BYSxDVAl.js";
-import { a as writeAppletSupport, n as loadCliManifest, o as writeWorkspaceSupport, t as assertWorkspaceCli } from "./project-CbYPtpPq.js";
+import { a as ORG_CODE_PATTERN, i as APPLET_CODE_PATTERN } from "./manifest-CJSL9GuC.js";
+import { d as resolveAuthForOrg, f as resolveInstanceUrl, i as readWorkspaceConfig } from "./workspace-D0dnnlxL.js";
+import { n as runGenerate } from "./generate-BEIYs17x.js";
+import { a as writeAppletSupport, n as loadCliManifest, o as writeWorkspaceSupport, t as assertWorkspaceCli } from "./project-BRZGd6xq.js";
+import { n as loadAppletSourceDefinition } from "./load-config-xEdTXs0y.js";
 import { access, cp, mkdir, readdir, writeFile } from "node:fs/promises";
 import { relative, resolve } from "node:path";
 import { spawn } from "node:child_process";
@@ -23,8 +23,11 @@ async function assertTargetIsAvailable(paths, targetType) {
 	if (existingPath !== void 0) throw new Error(`Refusing to initialize ${targetType}: ${existingPath} already exists.`);
 }
 async function assertDirectoryIsEmpty(path) {
-	const [entry] = await readdir(path);
-	if (entry !== void 0) throw new Error(`Refusing to initialize a workspace: ${path} is not empty (${entry} exists).`);
+	const entries = await readdir(path);
+	if (entries.length > 0) {
+		const [entry] = entries;
+		throw new Error(`Refusing to initialize a workspace: ${path} is not empty (${entry} exists).`);
+	}
 }
 async function installDependencies(target, install) {
 	if (!install) return "skipped";
@@ -92,22 +95,17 @@ async function runGit(cwd, args) {
 		});
 	});
 }
-async function generateAppletFiles(target, org, options, installResult) {
+async function generateAppletFiles(target, org, installResult) {
 	if (installResult === "failed") return false;
 	const previousCwd = process.cwd();
 	try {
-		const instanceUrl = await resolveInstanceUrl(void 0, options.store);
-		if (await resolveAuthForOrg(instanceUrl, org, options.store) === void 0) {
+		const instanceUrl = await resolveInstanceUrl();
+		if (await resolveAuthForOrg(instanceUrl, org) === void 0) {
 			console.log("Not logged in. Run applet generate to pull the organization's generated files; it will prompt a login.");
 			return false;
 		}
 		process.chdir(target);
-		await runGenerate({
-			fetch: options.fetch,
-			login: options.login,
-			stdinIsTTY: options.stdinIsTTY,
-			store: options.store
-		});
+		await runGenerate();
 		return true;
 	} catch (error) {
 		console.warn(`Generation skipped: ${error instanceof Error ? error.message : String(error)}`);
@@ -228,7 +226,7 @@ export default { router };
 	]);
 	await Promise.all([writeAppletSupport(appletTarget, definition), cli === void 0 ? void 0 : writeWorkspaceSupport(workspaceRoot, config, cli)]);
 	const installResult = await installDependencies(workspaceRoot, options.install ?? true);
-	const generateSucceeded = await generateAppletFiles(appletTarget, config.org, options, installResult);
+	const generateSucceeded = await generateAppletFiles(appletTarget, config.org, installResult);
 	const relativeTarget = relative(workspaceRoot, appletTarget);
 	const nextSteps = [
 		...installResult === "succeeded" ? [`cd ${JSON.stringify(relativeTarget)}`] : ["pnpm install", `cd ${JSON.stringify(relativeTarget)}`],

package/dist/{load-config-BYSxDVAl.js → load-config-xEdTXs0y.js}

@@ -1,5 +1,5 @@
-import { r as appletSourceDefinitionSchema } from "./manifest-Bp87Uz0a.js";
-import { t as resolveWorkspaceOrg } from "./workspace-XVtM12ZC.js";
+import { r as appletSourceDefinitionSchema } from "./manifest-CJSL9GuC.js";
+import { t as resolveWorkspaceOrg } from "./workspace-D0dnnlxL.js";
 import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import { loadConfigFromFile } from "vite";

package/dist/log-context-zu8U9Sjm.js

@@ -0,0 +1,73 @@
+import { channel } from "node:diagnostics_channel";
+//#region src/server/log-context.ts
+const REQUEST_CONTEXT_CHANNEL = "hitch.request.context";
+const APP_CONTEXT_CHANNEL = "hitch.request.app";
+const isUuid = (value) => typeof value === "string" && /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
+function requestIdFrom(headers) {
+	const requestId = headers.get("x-request-id");
+	return isUuid(requestId) ? requestId : crypto.randomUUID();
+}
+function publishNote(requestId, fields, channelName = REQUEST_CONTEXT_CHANNEL) {
+	const note = Object.fromEntries(Object.entries(fields).filter(([, value]) => value !== void 0));
+	if (Object.keys(note).length === 0) return;
+	const serialized = JSON.stringify({
+		requestId,
+		...note
+	});
+	channel(channelName).publish(serialized.length > 16384 ? {
+		requestId,
+		noteDropped: true,
+		noteBytes: serialized.length,
+		noteKeys: Object.keys(note)
+	} : {
+		requestId,
+		...note
+	});
+}
+function errorNote(error) {
+	return { error: error instanceof Error ? {
+		name: error.name,
+		message: error.message,
+		stack: error.stack?.slice(0, 8192),
+		...error.cause instanceof Error && { cause: {
+			name: error.cause.name,
+			message: error.cause.message
+		} }
+	} : {
+		name: "Error",
+		message: String(error)
+	} };
+}
+function cloudflareRequestFields(request) {
+	const cf = Reflect.get(request, "cf");
+	const field = (key) => typeof cf === "object" && cf !== null && key in cf ? Reflect.get(cf, key) : void 0;
+	const colo = field("colo");
+	const country = field("country");
+	const asn = field("asn");
+	return {
+		cfRay: request.headers.get("cf-ray") ?? void 0,
+		traceparent: request.headers.get("traceparent") ?? void 0,
+		colo: typeof colo === "string" ? colo : void 0,
+		country: typeof country === "string" ? country : void 0,
+		asn: typeof asn === "number" ? asn : void 0
+	};
+}
+function createNoteLog(initial) {
+	const context = { ...initial };
+	const log = {
+		set(fields) {
+			Object.assign(context, fields);
+			publishNote(initial.requestId, fields);
+		},
+		error(error) {
+			log.set(errorNote(error));
+		},
+		getContext() {
+			return { ...context };
+		}
+	};
+	publishNote(initial.requestId, initial);
+	return log;
+}
+//#endregion
+export { errorNote as a, requestIdFrom as c, createNoteLog as i, REQUEST_CONTEXT_CHANNEL as n, isUuid as o, cloudflareRequestFields as r, publishNote as s, APP_CONTEXT_CHANNEL as t };

package/dist/{login-C7RKmmTe.js → login-CUx3TmFQ.js}

@@ -1,4 +1,4 @@
-import { a as loginWithDevice, d as resolveInstanceUrl, o as AuthenticationError, r as findWorkspaceConfig } from "./workspace-XVtM12ZC.js";
+import { a as loginWithDevice, f as resolveInstanceUrl, o as AuthenticationError, r as findWorkspaceConfig } from "./workspace-D0dnnlxL.js";
 //#region src/login.ts
 async function runLogin(options) {
 	if (process.env.HITCH_API_KEY !== void 0) throw new AuthenticationError("HITCH_API_KEY is set — unset it to manage stored logins.");

package/dist/{logs-DgjgAxj2.js → logs-DSjuEN0Q.js}

@@ -1,6 +1,6 @@
-import { i as APPLET_CODE_PATTERN } from "./manifest-Bp87Uz0a.js";
-import { i as readWorkspaceConfig, n as fetchWithOrgAuth, t as resolveWorkspaceOrg } from "./workspace-XVtM12ZC.js";
-import { t as loadAppletConfig } from "./load-config-BYSxDVAl.js";
+import { i as APPLET_CODE_PATTERN } from "./manifest-CJSL9GuC.js";
+import { i as readWorkspaceConfig, n as fetchWithOrgAuth, t as resolveWorkspaceOrg } from "./workspace-D0dnnlxL.js";
+import { t as loadAppletConfig } from "./load-config-xEdTXs0y.js";
 import { z } from "zod";
 //#region src/logs.ts
 const LOG_LEVELS = [
@@ -19,6 +19,16 @@ const logSchema = z.object({
 	timestamp: z.number(),
 	level: z.string(),
 	message: z.string(),
+	context: z.record(z.string(), z.unknown()).optional(),
+	error: z.object({
+		name: z.string(),
+		message: z.string(),
+		stack: z.string().optional(),
+		cause: z.object({
+			name: z.string(),
+			message: z.string()
+		}).optional()
+	}).optional(),
 	releaseId: z.string(),
 	type: z.string().optional(),
 	runId: z.string().optional(),
@@ -93,20 +103,6 @@ async function readErrorDetails(response) {
 	}
 	return "";
 }
-function waitForPoll(signal) {
-	if (signal?.aborted === true) return Promise.resolve(false);
-	return new Promise((resolve) => {
-		const timeout = setTimeout(() => {
-			signal?.removeEventListener("abort", onAbort);
-			resolve(true);
-		}, POLL_INTERVAL_MS);
-		const onAbort = () => {
-			clearTimeout(timeout);
-			resolve(false);
-		};
-		signal?.addEventListener("abort", onAbort, { once: true });
-	});
-}
 function printLog(log) {
 	const details = log.type === "invocation" ? [
 		log.statusCode === void 0 ? void 0 : `status=${log.statusCode}`,
@@ -114,7 +110,9 @@ function printLog(log) {
 		log.wallTimeMs === void 0 ? void 0 : `wall=${log.wallTimeMs}ms`,
 		log.cpuTimeMs === void 0 ? void 0 : `cpu=${log.cpuTimeMs}ms`
 	].filter((value) => value !== void 0) : [];
-	console.log(`${new Date(log.timestamp).toISOString()} ${log.level.toUpperCase().padEnd(5)} ${log.type === "workflow" ? `[${log.workflow} ${log.runId?.slice(0, 8)}#${log.invocation}] ` : ""}${log.message}${details.length === 0 ? "" : ` [${details.join(" ")}]`}`);
+	console.log(`${new Date(log.timestamp).toISOString()} ${log.level.toUpperCase().padEnd(5)} ${log.type === "workflow" ? `[${log.workflow} ${log.runId?.slice(0, 8)}#${log.invocation}] ` : ""}${log.message}${details.length === 0 ? "" : ` [${details.join(" ")}]`}${log.context === void 0 ? "" : ` ${JSON.stringify(log.context)}`}`);
+	if (log.error) console.log(log.error.stack ?? `${log.error.name}: ${log.error.message}`);
+	if (log.error?.cause) console.log(`Caused by ${log.error.cause.name}: ${log.error.cause.message}`);
 }
 async function runLogs(options) {
 	const [{ code, org }, since, limit, level, userFilter, search] = await Promise.all([
@@ -127,13 +125,12 @@ async function runLogs(options) {
 	]);
 	const runFilter = options.run === void 0 ? void 0 : { runId: { $eq: options.run } };
 	const filter = runFilter === void 0 ? userFilter : userFilter === void 0 ? runFilter : { $and: [runFilter, userFilter] };
-	const fetcher = options.fetch ?? globalThis.fetch;
 	const startedAt = Date.now();
 	const requestLogs = async (from, to) => {
-		const response = await fetchWithOrgAuth(org, options, (instanceUrl, accessToken) => {
+		const response = await fetchWithOrgAuth(org, (instanceUrl, accessToken) => {
 			const url = new URL(`/api/v1/applets/${encodeURIComponent(code)}/logs/query`, `${instanceUrl}/`);
 			const levelFilter = level === void 0 ? void 0 : { level: { $in: LOG_LEVELS.slice(LOG_LEVELS.indexOf(level)) } };
-			return fetcher(url, {
+			return fetch(url, {
 				method: "POST",
 				headers: {
 					Authorization: `Bearer ${accessToken}`,
@@ -172,7 +169,8 @@ async function runLogs(options) {
 		return;
 	}
 	let lastTimestamp = initialLogs.at(-1)?.timestamp ?? startedAt;
-	while (await waitForPoll(options.signal)) {
+	for (;;) {
+		await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
 		const to = Date.now();
 		const logs = await requestLogs(Math.max(startedAt - since, lastTimestamp - LIVE_OVERLAP_MS), to);
 		printNewLogs(logs);

package/dist/{manifest-DD_SGkS6.d.ts → manifest-C6_F4bL8.d.ts}

@@ -35,7 +35,9 @@ interface AppletManifest {
   /** This code needs the schema as of this changeset. */
   requiresChangeset?: string;
   telephony?: {
-    events: readonly "message.received"[];
+    read?: boolean;
+    send?: boolean;
+    events?: readonly "message.received"[];
   };
   schedules?: readonly {
     code: string;
@@ -53,6 +55,8 @@ interface AppletManifest {
     canDelete: boolean;
     readOnly: readonly string[];
     readWrite: readonly string[];
+    optional?: boolean;
+    optionalAttributes?: readonly string[];
   }[];
 }
 type AppletDefinition = Omit<AppletManifest, "org">;

package/dist/{manifest-Bp87Uz0a.js → manifest-CJSL9GuC.js}

@@ -31,13 +31,22 @@ const appletManifestObjectSchema = z.strictObject({
 	canCreate: z.boolean(),
 	canDelete: z.boolean(),
 	readOnly: attributeCodesSchema,
-	readWrite: attributeCodesSchema
+	readWrite: attributeCodesSchema,
+	optional: z.boolean().optional(),
+	optionalAttributes: attributeCodesSchema.optional()
 }).superRefine((object, context) => {
 	const overlap = object.readOnly.find((code) => object.readWrite.includes(code));
 	if (overlap !== void 0) context.addIssue({
 		code: "custom",
 		message: `readOnly and readWrite both contain "${overlap}".`
 	});
+	object.optionalAttributes?.forEach((code, index) => {
+		if (!object.readOnly.includes(code) && !object.readWrite.includes(code)) context.addIssue({
+			code: "custom",
+			message: `optionalAttributes contains undeclared attribute code "${code}".`,
+			path: ["optionalAttributes", index]
+		});
+	});
 });
 const appletManifestObjectsSchema = z.array(appletManifestObjectSchema).readonly();
 const appletManifestSchedulesSchema = z.array(z.strictObject({
@@ -64,7 +73,11 @@ const appletManifestShape = {
 	name: nameSchema,
 	code: codeSchema,
 	requiresChangeset: z.uuid().optional(),
-	telephony: z.strictObject({ events: z.array(z.literal("message.received")).min(1).refine((events) => new Set(events).size === events.length).readonly() }).optional(),
+	telephony: z.strictObject({
+		read: z.boolean().optional(),
+		send: z.boolean().optional(),
+		events: z.array(z.literal("message.received")).min(1).refine((events) => new Set(events).size === events.length).readonly().optional()
+	}).refine((telephony) => telephony.events === void 0 || telephony.read === true, "telephony.events needs telephony.read").optional(),
 	schedules: appletManifestSchedulesSchema.optional(),
 	variables: appletManifestVariablesSchema.optional(),
 	objects: appletManifestObjectsSchema
@@ -104,6 +117,7 @@ const appletDefinitionSchema = z.strictObject({
 }).superRefine(checkDuplicateCodes);
 const packageVersionsSchema = z.record(z.string().min(1), z.string().min(1)).readonly();
 const RESERVED_APPLET_PACKAGES = /* @__PURE__ */ new Set([
+	"@fontsource-variable/geist-mono",
 	"@fontsource-variable/inter",
 	"@hitch42/applet",
 	"@orpc/contract",
@@ -123,14 +137,16 @@ const RESERVED_APPLET_PACKAGES = /* @__PURE__ */ new Set([
 	"@types/react",
 	"@types/react-dom",
 	"class-variance-authority",
-	"clsx",
+	"cn",
 	"lucide-react",
+	"oxfmt",
+	"oxlint",
+	"oxlint-tsgolint",
 	"react",
 	"react-aria-components",
 	"react-dom",
 	"shadcn",
 	"streamdown",
-	"tailwind-merge",
 	"tailwindcss",
 	"tw-animate-css",
 	"typescript",