@tokamakdev/tok 0.1.1-beta.142 → 0.1.1-beta.144

package/dist/astro.mjs

@@ -6,7 +6,7 @@ import cloudflare, {} from "@astrojs/cloudflare";
 import { sessionDrivers } from "astro/config";
 import { normalizePath } from "vite";
 import { experimental_readRawConfig, unstable_readConfig } from "wrangler";
-import { createNativeWorker } from "./native-worker.mjs";
+import { createNativeWorker, rejectAuxiliaryWorkers } from "./native-worker.mjs";
 import { createClientPlugin } from "./client.mjs";
 import { writeChanged } from "./worker-graph.mjs";
 /** The Worker entry Astro's Cloudflare adapter builds when the configuration names none. */
@@ -52,9 +52,7 @@ export function tokamak(options = {}, cloudflareOptions = {}) {
             },
         };
     }
-    if (cloudflareOptions.auxiliaryWorkers?.length) {
-        throw new Error("Tokamak hosts the main and native workers; additional auxiliary workers are not supported.");
-    }
+    rejectAuxiliaryWorkers(cloudflareOptions);
     const generated = path.join(path.dirname(cloudflareOptions.configPath ?? "."), `.tokamak.${randomUUID()}.json`);
     let generatedPath;
     const cleanup = () => {

package/dist/client.mjs

@@ -1,12 +1,10 @@
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
 import { findModule } from "./worker-contract.mjs";
+import { CAPABILITIES, corePath } from "./worker-graph.mjs";
 import { WorkerTypes } from "./worker-types.mjs";
 const MODULE = "virtual:tokamak/client";
-/** The Tokamak worker's page module of each plugin operation's support on the app's platform. */
-const CAPABILITIES = "/_tokamak/capabilities.js";
-const TRANSPORT = normalizePath(fileURLToPath(new URL("./rpc/client.mjs", import.meta.resolve("@tokamakdev/plugin/events"))));
+const TRANSPORT = corePath("./rpc/client.mjs");
 /** The app's public methods, without its native implementation. */
 export function createClientPlugin(module, native, shared) {
     let root;

package/dist/dev-socket.d.mts

@@ -1,11 +1,5 @@
 /** The header that carries the device's session token, which `tok dev`'s relay forwards. */
 export declare const SESSION_HEADER = "x-tokamak-session";
-/** The native endpoint's opaque result and completion status. */
-export interface PluginResult {
-    payload: Uint8Array;
-    failed: boolean;
-    done: boolean;
-}
 /** The loopback server the device's dev WebSocket reaches through `tok dev`'s relay. */
 export interface DevSocket {
     readonly port: number;

package/dist/events.d.mts

@@ -1,4 +1,3 @@
-import { type LifecycleStage, type TokamakContext } from "@tokamakdev/plugin";
 /** Runs once per runtime start, including when the system starts the app in the background. */
 export declare const onStart: (listener: import("@tokamakdev/plugin/events").Listener<{
     readonly foreground: boolean;
@@ -7,10 +6,4 @@ export declare const onStart: (listener: import("@tokamakdev/plugin/events").Lis
 export declare const onResume: (listener: import("@tokamakdev/plugin/events").Listener<Readonly<Record<string, never>>, void>) => void;
 /** Runs each time the app moves out of the foreground. */
 export declare const onSuspend: (listener: import("@tokamakdev/plugin/events").Listener<Readonly<Record<string, never>>, void>) => void;
-export type { LifecycleStage } from "@tokamakdev/plugin";
-/**
- * The app's stage now, which can differ from the last event delivered: an `onSuspend` listener
- * that runs late reads `"foreground"` once the user has returned. Rejects with
- * `NotSupportedError` outside a tokamak Worker.
- */
-export declare function getLifecycleStage(ctx: TokamakContext): Promise<LifecycleStage>;
+export { lifecycleStage as getLifecycleStage, type LifecycleStage } from "@tokamakdev/plugin";

package/dist/events.mjs

@@ -1,4 +1,3 @@
-import { lifecycleStage } from "@tokamakdev/plugin";
 import { defineEvent } from "@tokamakdev/plugin/events";
 /** Runs once per runtime start, including when the system starts the app in the background. */
 export const onStart = defineEvent("start");
@@ -6,11 +5,4 @@ export const onStart = defineEvent("start");
 export const onResume = defineEvent("resume");
 /** Runs each time the app moves out of the foreground. */
 export const onSuspend = defineEvent("suspend");
-/**
- * The app's stage now, which can differ from the last event delivered: an `onSuspend` listener
- * that runs late reads `"foreground"` once the user has returned. Rejects with
- * `NotSupportedError` outside a tokamak Worker.
- */
-export function getLifecycleStage(ctx) {
-    return lifecycleStage(ctx);
-}
+export { lifecycleStage as getLifecycleStage } from "@tokamakdev/plugin";

package/dist/native-worker.d.mts

@@ -7,6 +7,10 @@ export type TokamakOptions = Config & {
     module?: string;
 };
 type AuxiliaryWorker = NonNullable<PluginConfig["auxiliaryWorkers"]>[number];
+/** Rejects Cloudflare options that add Workers beside the main and native workers Tokamak hosts. */
+export declare function rejectAuxiliaryWorkers(options: {
+    auxiliaryWorkers?: readonly unknown[];
+}): void;
 /** The native worker and its development relay. */
 export declare function createNativeWorker(options: TokamakOptions, output: string, prepare?: (root: string, graph: WorkerGraph) => void | Promise<void>): {
     plugin: Plugin;

package/dist/native-worker.mjs

@@ -5,9 +5,14 @@ import { normalizePath } from "vite";
 import { capabilitiesFor } from "@tokamakdev/plugin/capabilities";
 import { openDevSocket } from "./dev-socket.mjs";
 import { findModule } from "./worker-contract.mjs";
-import { createWorkerGraph } from "./worker-graph.mjs";
-const CAPABILITIES = "/_tokamak/capabilities.js";
+import { CAPABILITIES, createWorkerGraph } from "./worker-graph.mjs";
 const MIDDLEWARE_MODE_ERROR = "Vite is running in middleware mode, so tokamak cannot find the development server's address; tok dev needs Vite's own dev server";
+/** Rejects Cloudflare options that add Workers beside the main and native workers Tokamak hosts. */
+export function rejectAuxiliaryWorkers(options) {
+    if (options.auxiliaryWorkers?.length) {
+        throw new Error("Tokamak hosts the main and native workers; additional auxiliary workers are not supported.");
+    }
+}
 /** The native worker and its development relay. */
 export function createNativeWorker(options, output, prepare) {
     const { module, ...config } = options;

package/dist/plugin-manifest.d.mts

@@ -1,6 +1,5 @@
 import type { NativePlatform } from "@tokamakdev/plugin/capabilities";
-export type { NativePlatform };
-export interface ModuleExport {
+interface ModuleExport {
     module: string;
     export: string;
 }
@@ -17,3 +16,4 @@ export interface PluginDefinition {
 }
 /** Installed direct dependencies select the application's plugin services. */
 export declare function discoverPlugins(root: string): PluginDefinition[];
+export {};

package/dist/vite.mjs

@@ -1,12 +1,11 @@
 import { cloudflare } from "@cloudflare/vite-plugin";
-import { createNativeWorker } from "./native-worker.mjs";
+import { createNativeWorker, rejectAuxiliaryWorkers } from "./native-worker.mjs";
 import { createClientPlugin } from "./client.mjs";
 /** Cloudflare's Vite integration, with a separate native worker when run by tok. */
 export function tokamak(options = {}, cloudflareOptions = {}) {
     const output = process.env.TOKAMAK_VITE_OUTPUT;
-    if (output && cloudflareOptions.auxiliaryWorkers?.length) {
-        throw new Error("Tokamak hosts the main and native workers; additional auxiliary workers are not supported.");
-    }
+    if (output)
+        rejectAuxiliaryWorkers(cloudflareOptions);
     const native = output ? createNativeWorker(options, output) : undefined;
     const client = createClientPlugin(options.module, !!output, native ? () => native.graph().types : undefined);
     return [...native ? [native.plugin] : [], client, ...cloudflare({

package/dist/worker-contract.d.mts

@@ -1,4 +1,5 @@
-import type { NativePlatform, PluginDefinition } from "./plugin-manifest.mjs";
+import type { NativePlatform } from "@tokamakdev/plugin/capabilities";
+import type { PluginDefinition } from "./plugin-manifest.mjs";
 /** The callable prototype methods and source dependencies of a Worker entrypoint. */
 export interface WorkerContract {
     methods: string[];
@@ -17,10 +18,6 @@ export interface PluginContract extends WorkerContract {
 /** The contract of a Tokamak worker without a module. */
 export declare function emptyContract(): WorkerContract;
 export declare function findModule(root: string, name: string | undefined): string | undefined;
-/** Resolve the application's types before generating its service adapters. */
-export declare function readWorkerContract(entry: string, root: string): WorkerContract;
-/** Check every WorkerEntrypoint exported by an application service bundle. */
-export declare function readServiceContracts(entry: string, root: string): Record<string, WorkerContract>;
 /** Analyze both entrypoints in one TypeScript program. */
 export declare function readWorkerContracts(entry: string | undefined, main: string | undefined, root: string, validate: boolean, plugins?: PluginDefinition[]): {
     native: WorkerContract;

package/dist/worker-contract.mjs

@@ -18,14 +18,6 @@ export function findModule(root, name) {
         throw new Error(`tokamak module not found: ${candidates[0]}`);
     return file;
 }
-/** Resolve the application's types before generating its service adapters. */
-export function readWorkerContract(entry, root) {
-    return readWorkerContracts(entry, undefined, root, true).native;
-}
-/** Check every WorkerEntrypoint exported by an application service bundle. */
-export function readServiceContracts(entry, root) {
-    return readWorkerContracts(undefined, entry, root, true).main;
-}
 /** Analyze both entrypoints in one TypeScript program. */
 export function readWorkerContracts(entry, main, root, validate, plugins = []) {
     const entries = [entry, main, ...plugins.flatMap(plugin => [plugin.api.module, plugin.web?.module])]

package/dist/worker-graph.d.mts

@@ -20,7 +20,6 @@ export interface WorkerGraph {
     serviceBindings(config: ServiceConfiguration): ServiceBindings;
     native: AuxiliaryCustomizer;
     names(): {
-        main: string;
         native: string;
         app: string;
     };
@@ -38,9 +37,13 @@ export interface WorkerGraph {
         load: Extract<Plugin["load"], (...args: never[]) => unknown>;
     };
 }
+/** The Tokamak worker's page module of each plugin operation's support on the app's platform. */
+export declare const CAPABILITIES = "/_tokamak/capabilities.js";
 /** Configure the two bundles through Cloudflare's public auxiliary-worker API. */
 export declare function createWorkerGraph(root: string, entry: string | undefined, output: string): WorkerGraph;
 export declare function workerName(main: string): string;
+/** The Vite path of `file`, relative to the source directory of `@tokamakdev/plugin`. */
+export declare function corePath(file: string): string;
 /** Writes `source` to `file` unless it already holds it, so watchers see only changes. */
 export declare function writeChanged(file: string, source: string): void;
 export {};

package/dist/worker-graph.mjs

@@ -5,6 +5,8 @@ import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
 import { platformGlobal } from "@tokamakdev/plugin/native-protocol";
 import { WorkerTypes } from "./worker-types.mjs";
+/** The Tokamak worker's page module of each plugin operation's support on the app's platform. */
+export const CAPABILITIES = "/_tokamak/capabilities.js";
 const NATIVE_CONNECTION = "virtual:tokamak/native-connection";
 const PLATFORM = "virtual:tokamak/platform";
 const NATIVE_CALLS = normalizePath(fileURLToPath(new URL("./native.mjs", import.meta.url)));
@@ -16,7 +18,7 @@ export function createWorkerGraph(root, entry, output) {
     const types = path.join(root, "tokamak-env.d.ts");
     const contracts = new WorkerTypes(root, entry);
     contracts.discover();
-    const events = normalizePath(fileURLToPath(new URL("./entrypoint.js", import.meta.resolve("@tokamakdev/plugin/events"))));
+    const events = corePath("./entrypoint.js");
     let mainName;
     let nativeName;
     let appName;
@@ -27,7 +29,7 @@ export function createWorkerGraph(root, entry, output) {
     let configuredEntrypoints;
     const entrypoints = () => Object.keys(contracts.named).join();
     const signatures = new Map();
-    const development = normalizePath(fileURLToPath(new URL("./rpc/binding.mjs", import.meta.resolve("@tokamakdev/plugin/events"))));
+    const development = corePath("./rpc/binding.mjs");
     let relay;
     const serviceModule = (role) => `virtual:tokamak/service/${role}`;
     const bindingsModule = (role) => `\0tokamak:bindings:${role}`;
@@ -110,7 +112,7 @@ export const TokamakEvents = eventEntrypoint(Worker, nativeContext);\n`);
         configure,
         serviceBindings: config => services(checkedName(config)),
         native,
-        names: () => ({ main: mainName, native: nativeName, app: appName }),
+        names: () => ({ native: nativeName, app: appName }),
         types: contracts,
         cloudflare: {
             config: config => { configure(config); },
@@ -277,7 +279,7 @@ function availability(plugins) {
 }
 function serviceEntrypoint(entry, services) {
     const sdk = normalizePath(fileURLToPath(import.meta.resolve("@tokamakdev/plugin/worker")));
-    const rpc = normalizePath(fileURLToPath(new URL("./rpc/endpoint.mjs", import.meta.resolve("@tokamakdev/plugin/events"))));
+    const rpc = corePath("./rpc/endpoint.mjs");
     const plugins = services.flatMap(service => service.plugin ? [service.plugin] : []);
     const imports = services.map((service, index) => {
         if (service.plugin) {
@@ -324,7 +326,7 @@ export default class extends WorkerEntrypoint {
   get #instance() { return this.#worker ??= services[0].create(this.ctx, this.env); }
   fetch(request) {
     const { pathname } = new URL(request.url);
-    if (pathname === "/_tokamak/capabilities.js") return capabilitiesModule(nativeContext(this.ctx));
+    if (pathname === ${JSON.stringify(CAPABILITIES)}) return capabilitiesModule(nativeContext(this.ctx));
     const service = services.find(service => service.route === pathname);
     if (service) return rpcResponse(request, ctx => service.create(ctx, this.env), service.methods, this.ctx);
     if (typeof this.#instance.fetch !== "function") throw new TypeError("The Tokamak worker has no fetch handler");
@@ -335,6 +337,10 @@ export default class extends WorkerEntrypoint {
 ${named.join("")}
 `;
 }
+/** The Vite path of `file`, relative to the source directory of `@tokamakdev/plugin`. */
+export function corePath(file) {
+    return normalizePath(fileURLToPath(new URL(file, import.meta.resolve("@tokamakdev/plugin/events"))));
+}
 /** Writes `source` to `file` unless it already holds it, so watchers see only changes. */
 export function writeChanged(file, source) {
     if (fs.existsSync(file) && fs.readFileSync(file, "utf8") === source)

package/dist/worker-types.mjs

@@ -29,7 +29,6 @@ export class WorkerTypes {
         const source = path.resolve(config.configPath ? path.dirname(config.configPath) : this.root, config.main);
         this.mainEntry = fs.existsSync(source) ? source : config.main;
         this.mainModule = undefined;
-        this.#ready = false;
         this.bindings(config);
     }
     bindings(config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/tok",
-  "version": "0.1.1-beta.142",
+  "version": "0.1.1-beta.144",
   "description": "The tokamak CLI, Vite plugin and app API: build native apps from a Cloudflare Workers codebase",
   "repository": {
     "type": "git",
@@ -43,7 +43,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@tokamakdev/plugin": "0.1.0-beta.142",
+    "@tokamakdev/plugin": "0.1.0-beta.144",
     "typescript": "5.9.3",
     "ws": "^8.22.0"
   },
@@ -75,17 +75,17 @@
     "wrangler": "4.147.0"
   },
   "optionalDependencies": {
-    "@tokamakdev/platform-android-arm64": "0.1.1-beta.142",
-    "@tokamakdev/platform-ios-arm64": "0.1.1-beta.142",
-    "@tokamakdev/platform-ios-simulator-arm64": "0.1.1-beta.142",
-    "@tokamakdev/platform-ios-simulator-x64": "0.1.1-beta.142",
-    "@tokamakdev/platform-macos-arm64": "0.1.1-beta.142",
-    "@tokamakdev/platform-macos-x64": "0.1.1-beta.142",
-    "@tokamakdev/platform-windows-x64": "0.1.1-beta.142",
-    "@tokamakdev/tok-darwin-arm64": "0.1.1-beta.142",
-    "@tokamakdev/tok-darwin-x64": "0.1.1-beta.142",
-    "@tokamakdev/tok-linux-x64": "0.1.1-beta.142",
-    "@tokamakdev/tok-win32-x64": "0.1.1-beta.142"
+    "@tokamakdev/platform-android-arm64": "0.1.1-beta.144",
+    "@tokamakdev/platform-ios-arm64": "0.1.1-beta.144",
+    "@tokamakdev/platform-ios-simulator-arm64": "0.1.1-beta.144",
+    "@tokamakdev/platform-ios-simulator-x64": "0.1.1-beta.144",
+    "@tokamakdev/platform-macos-arm64": "0.1.1-beta.144",
+    "@tokamakdev/platform-macos-x64": "0.1.1-beta.144",
+    "@tokamakdev/platform-windows-x64": "0.1.1-beta.144",
+    "@tokamakdev/tok-darwin-arm64": "0.1.1-beta.144",
+    "@tokamakdev/tok-darwin-x64": "0.1.1-beta.144",
+    "@tokamakdev/tok-linux-x64": "0.1.1-beta.144",
+    "@tokamakdev/tok-win32-x64": "0.1.1-beta.144"
   },
   "publishConfig": {
     "access": "public"

package/platform.js

@@ -3,18 +3,12 @@
 const path = require("node:path");
 const { optionalDependencies } = require("./package.json");
 
-const PACKAGES = {
-  "darwin-arm64": "@tokamakdev/tok-darwin-arm64",
-  "darwin-x64": "@tokamakdev/tok-darwin-x64",
-  "linux-x64": "@tokamakdev/tok-linux-x64",
-  "win32-x64": "@tokamakdev/tok-win32-x64",
-};
 
 const PLATFORM_PACKS = Object.keys(optionalDependencies).filter((name) => name.startsWith("@tokamakdev/platform-"));
 
 function packageFor(platform, arch) {
-  const name = PACKAGES[`${platform}-${arch}`];
-  if (!name) throw new Error(`tokamak does not publish a CLI for ${platform} ${arch}`);
+  const name = `@tokamakdev/tok-${platform}-${arch}`;
+  if (!Object.hasOwn(optionalDependencies, name)) throw new Error(`tokamak does not publish a CLI for ${platform} ${arch}`);
   return name;
 }