@volter/world-runtime 3.0.86 → 3.0.88

package/dist/src/init.js

@@ -1158,66 +1158,58 @@ export async function seed(): Promise<void> {
   if ((process.env.VOLTER_SEED_SKIP ?? '').split(',').includes('${vendor}')) return;
   const base = process.env.${stem}_TWIN_URL;
   if (!base) throw new Error('${stem}_TWIN_URL is not set — bring the world up and run the seed with its env (volter-world attach/run)');
-<<<<<<< HEAD
-  // a call dated before the World's time (\`at\`: state the account made then, through the API as it was) is made with
-  // the World's clock frozen at that instant, and the clock is put back as it was found
+  const clients = new Map<string, SeedBrowser>();
+  const snapshots = new Map<string, Awaited<ReturnType<SeedBrowser['state']>>>();
+  let browserHelper: typeof import('@volter/world-core/browser') | undefined;
+  const browserCalls = ('browserSeed' in defaults ? defaults.browserSeed as typeof calls : undefined) ?? [];
+  const requests = [...calls, ...browserCalls];
   const clock = process.env.TWIN_WORLD_CLOCK_FILE;
-  const found = clock && existsSync(clock) ? readFileSync(clock, 'utf8') : undefined;
+  const dated = requests.some(call => call.at !== undefined);
+  const found = dated && clock && existsSync(clock) ? readFileSync(clock, 'utf8') : undefined;
+  const restoreClock = (): void => {
+    if (!dated || !clock) return;
+    if (found === undefined) rmSync(clock, { force: true }); else writeFileSync(clock, found);
+  };
   try {
-    for (const call of calls) {
+    for (const call of requests) {
       if (call.at !== undefined) {
         if (!clock) throw new Error('${vendor} seed: a dated call needs the World clock (TWIN_WORLD_CLOCK_FILE): run the seed attached to the World');
         writeFileSync(clock, \`\${new Date(call.at).toISOString()}\n\`);
+      } else restoreClock();
+      if (call.browser) {
+        if (!snapshots.has(call.browser)) {
+          const door = process.env.VOLTER_WORLD_BROWSER_DOOR;
+          const token = process.env.VOLTER_WORLD_BROWSER_TOKEN;
+          if (!door || !token) throw new Error('browser defaults run in a World seed with its browsers door and credential');
+          const held = await fetch(\`\${door}/\${encodeURIComponent(call.browser)}\`, { headers: { 'x-volter-token': token } });
+          if (!held.ok && held.status !== 404) throw new Error(\`browser \${call.browser}: \${held.status} \${await held.text()}\`);
+          snapshots.set(call.browser, held.ok ? await held.json() as Awaited<ReturnType<SeedBrowser['state']>> : { storageState: { cookies: [], origins: [] }, context: {} });
+        }
+        browserHelper ??= await import('@volter/world-core/browser').catch(error => {
+          throw new Error('Install @volter/world-core 3.0.37 or later in this project to seed browsers.', { cause: error });
+        });
+        const initial = snapshots.get(call.browser)!;
+        const hostname = new URL(call.path).hostname;
+        if (initial.storageState.cookies.some(cookie => browserHelper!.cookieMatchesHost(cookie, hostname))
+          || initial.storageState.origins.some(origin => new URL(origin.origin).hostname === hostname)) continue;
+      }
+      const headers = { ...(call.body !== undefined ? { 'content-type': 'application/json' } : {}), ...(call.headers ?? {}) };
+      const form = /^application\\/x-www-form-urlencoded\\b/i.test(new Headers(headers).get('content-type') ?? '');
+      const body = call.body === undefined ? undefined : form
+        ? new URLSearchParams(Object.entries(call.body as Record<string, unknown>).map(([key, value]) => [key, String(value)]))
+        : JSON.stringify(call.body);
+      if (call.browser && !clients.has(call.browser)) {
+        clients.set(call.browser, await browserHelper!.browser(call.browser));
       }
-      const res = await fetch(\`\${base.replace(/\\/$/, '')}\${call.path}\`, {
+      const client = call.browser ? clients.get(call.browser)! : null;
+      const res = await (client ? client.fetch : fetch)(client ? call.path : \`\${base.replace(/\\/$/, '')}\${call.path}\`, {
         method: call.method,
-        headers: { ...(call.body !== undefined ? { 'content-type': 'application/json' } : {}), ...(call.headers ?? {}) },
-        ...(call.body !== undefined ? { body: JSON.stringify(call.body) } : {}),
+        headers, ...(body === undefined ? {} : { body }),
       });
       if (!res.ok) throw new Error(\`${vendor} seed: \${call.method} \${call.path}: \${res.status} \${await res.text()}\`);
     }
   } finally {
-    if (clock && calls.some((call) => call.at !== undefined)) {
-      if (found === undefined) rmSync(clock, { force: true }); else writeFileSync(clock, found);
-    }
-=======
-  const clients = new Map<string, SeedBrowser>();
-  const snapshots = new Map<string, Awaited<ReturnType<SeedBrowser['state']>>>();
-  let browserHelper: typeof import('@volter/world-core/browser') | undefined;
-  const browserCalls = ('browserSeed' in defaults ? defaults.browserSeed as typeof calls : undefined) ?? [];
-  for (const call of [...calls, ...browserCalls]) {
-    if (call.browser) {
-      if (!snapshots.has(call.browser)) {
-        const door = process.env.VOLTER_WORLD_BROWSER_DOOR;
-        const token = process.env.VOLTER_WORLD_BROWSER_TOKEN;
-        if (!door || !token) throw new Error('browser defaults run in a World seed with its browsers door and credential');
-        const held = await fetch(\`\${door}/\${encodeURIComponent(call.browser)}\`, { headers: { 'x-volter-token': token } });
-        if (!held.ok && held.status !== 404) throw new Error(\`browser \${call.browser}: \${held.status} \${await held.text()}\`);
-        snapshots.set(call.browser, held.ok ? await held.json() as Awaited<ReturnType<SeedBrowser['state']>> : { storageState: { cookies: [], origins: [] }, context: {} });
-      }
-      browserHelper ??= await import('@volter/world-core/browser').catch(error => {
-        throw new Error('Install @volter/world-core 3.0.37 or later in this project to seed browsers.', { cause: error });
-      });
-      const initial = snapshots.get(call.browser)!;
-      const hostname = new URL(call.path).hostname;
-      if (initial.storageState.cookies.some(cookie => browserHelper!.cookieMatchesHost(cookie, hostname))
-        || initial.storageState.origins.some(origin => new URL(origin.origin).hostname === hostname)) continue;
-    }
-    const headers = { ...(call.body !== undefined ? { 'content-type': 'application/json' } : {}), ...(call.headers ?? {}) };
-    const form = /^application\\/x-www-form-urlencoded\\b/i.test(new Headers(headers).get('content-type') ?? '');
-    const body = call.body === undefined ? undefined : form
-      ? new URLSearchParams(Object.entries(call.body as Record<string, unknown>).map(([key, value]) => [key, String(value)]))
-      : JSON.stringify(call.body);
-    if (call.browser && !clients.has(call.browser)) {
-      clients.set(call.browser, await browserHelper!.browser(call.browser));
-    }
-    const client = call.browser ? clients.get(call.browser)! : null;
-    const res = await (client ? client.fetch : fetch)(client ? call.path : \`\${base.replace(/\\/$/, '')}\${call.path}\`, {
-      method: call.method,
-      headers, ...(body === undefined ? {} : { body }),
-    });
-    if (!res.ok) throw new Error(\`${vendor} seed: \${call.method} \${call.path}: \${res.status} \${await res.text()}\`);
->>>>>>> origin/main
+    restoreClock();
   }
 }
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/world-runtime",
-  "version": "3.0.86",
+  "version": "3.0.88",
   "description": "World configs for twins: boot named local runtimes, allocate ports, generate world.env/instance.json, and run apps against fake-key twin worlds.",
   "keywords": [
     "twin",
@@ -69,14 +69,14 @@
     "node": ">=22.3"
   },
   "peerDependencies": {
-    "@volter/world-core": "3.0.86",
-    "@volter/world-console": "3.0.81"
+    "@volter/world-core": "3.0.88",
+    "@volter/world-console": "3.0.83"
   },
   "dependencies": {
     "@electric-sql/pglite": "0.5.8",
     "@electric-sql/pglite-pgvector": "0.0.9",
     "@volter/world-access": "3.0.1",
-    "@volter/world-core": "3.0.86",
+    "@volter/world-core": "3.0.88",
     "mongodb": "~6.20.0",
     "pg-gateway": "0.3.0-beta.4",
     "smol-toml": "^1.8.0",

package/src/init.ts

@@ -1347,66 +1347,58 @@ export async function seed(): Promise<void> {
   if ((process.env.VOLTER_SEED_SKIP ?? '').split(',').includes('${vendor}')) return;
   const base = process.env.${stem}_TWIN_URL;
   if (!base) throw new Error('${stem}_TWIN_URL is not set — bring the world up and run the seed with its env (volter-world attach/run)');
-<<<<<<< HEAD
-  // a call dated before the World's time (\`at\`: state the account made then, through the API as it was) is made with
-  // the World's clock frozen at that instant, and the clock is put back as it was found
+  const clients = new Map<string, SeedBrowser>();
+  const snapshots = new Map<string, Awaited<ReturnType<SeedBrowser['state']>>>();
+  let browserHelper: typeof import('@volter/world-core/browser') | undefined;
+  const browserCalls = ('browserSeed' in defaults ? defaults.browserSeed as typeof calls : undefined) ?? [];
+  const requests = [...calls, ...browserCalls];
   const clock = process.env.TWIN_WORLD_CLOCK_FILE;
-  const found = clock && existsSync(clock) ? readFileSync(clock, 'utf8') : undefined;
+  const dated = requests.some(call => call.at !== undefined);
+  const found = dated && clock && existsSync(clock) ? readFileSync(clock, 'utf8') : undefined;
+  const restoreClock = (): void => {
+    if (!dated || !clock) return;
+    if (found === undefined) rmSync(clock, { force: true }); else writeFileSync(clock, found);
+  };
   try {
-    for (const call of calls) {
+    for (const call of requests) {
       if (call.at !== undefined) {
         if (!clock) throw new Error('${vendor} seed: a dated call needs the World clock (TWIN_WORLD_CLOCK_FILE): run the seed attached to the World');
         writeFileSync(clock, \`\${new Date(call.at).toISOString()}\n\`);
+      } else restoreClock();
+      if (call.browser) {
+        if (!snapshots.has(call.browser)) {
+          const door = process.env.VOLTER_WORLD_BROWSER_DOOR;
+          const token = process.env.VOLTER_WORLD_BROWSER_TOKEN;
+          if (!door || !token) throw new Error('browser defaults run in a World seed with its browsers door and credential');
+          const held = await fetch(\`\${door}/\${encodeURIComponent(call.browser)}\`, { headers: { 'x-volter-token': token } });
+          if (!held.ok && held.status !== 404) throw new Error(\`browser \${call.browser}: \${held.status} \${await held.text()}\`);
+          snapshots.set(call.browser, held.ok ? await held.json() as Awaited<ReturnType<SeedBrowser['state']>> : { storageState: { cookies: [], origins: [] }, context: {} });
+        }
+        browserHelper ??= await import('@volter/world-core/browser').catch(error => {
+          throw new Error('Install @volter/world-core 3.0.37 or later in this project to seed browsers.', { cause: error });
+        });
+        const initial = snapshots.get(call.browser)!;
+        const hostname = new URL(call.path).hostname;
+        if (initial.storageState.cookies.some(cookie => browserHelper!.cookieMatchesHost(cookie, hostname))
+          || initial.storageState.origins.some(origin => new URL(origin.origin).hostname === hostname)) continue;
+      }
+      const headers = { ...(call.body !== undefined ? { 'content-type': 'application/json' } : {}), ...(call.headers ?? {}) };
+      const form = /^application\\/x-www-form-urlencoded\\b/i.test(new Headers(headers).get('content-type') ?? '');
+      const body = call.body === undefined ? undefined : form
+        ? new URLSearchParams(Object.entries(call.body as Record<string, unknown>).map(([key, value]) => [key, String(value)]))
+        : JSON.stringify(call.body);
+      if (call.browser && !clients.has(call.browser)) {
+        clients.set(call.browser, await browserHelper!.browser(call.browser));
       }
-      const res = await fetch(\`\${base.replace(/\\/$/, '')}\${call.path}\`, {
+      const client = call.browser ? clients.get(call.browser)! : null;
+      const res = await (client ? client.fetch : fetch)(client ? call.path : \`\${base.replace(/\\/$/, '')}\${call.path}\`, {
         method: call.method,
-        headers: { ...(call.body !== undefined ? { 'content-type': 'application/json' } : {}), ...(call.headers ?? {}) },
-        ...(call.body !== undefined ? { body: JSON.stringify(call.body) } : {}),
+        headers, ...(body === undefined ? {} : { body }),
       });
       if (!res.ok) throw new Error(\`${vendor} seed: \${call.method} \${call.path}: \${res.status} \${await res.text()}\`);
     }
   } finally {
-    if (clock && calls.some((call) => call.at !== undefined)) {
-      if (found === undefined) rmSync(clock, { force: true }); else writeFileSync(clock, found);
-    }
-=======
-  const clients = new Map<string, SeedBrowser>();
-  const snapshots = new Map<string, Awaited<ReturnType<SeedBrowser['state']>>>();
-  let browserHelper: typeof import('@volter/world-core/browser') | undefined;
-  const browserCalls = ('browserSeed' in defaults ? defaults.browserSeed as typeof calls : undefined) ?? [];
-  for (const call of [...calls, ...browserCalls]) {
-    if (call.browser) {
-      if (!snapshots.has(call.browser)) {
-        const door = process.env.VOLTER_WORLD_BROWSER_DOOR;
-        const token = process.env.VOLTER_WORLD_BROWSER_TOKEN;
-        if (!door || !token) throw new Error('browser defaults run in a World seed with its browsers door and credential');
-        const held = await fetch(\`\${door}/\${encodeURIComponent(call.browser)}\`, { headers: { 'x-volter-token': token } });
-        if (!held.ok && held.status !== 404) throw new Error(\`browser \${call.browser}: \${held.status} \${await held.text()}\`);
-        snapshots.set(call.browser, held.ok ? await held.json() as Awaited<ReturnType<SeedBrowser['state']>> : { storageState: { cookies: [], origins: [] }, context: {} });
-      }
-      browserHelper ??= await import('@volter/world-core/browser').catch(error => {
-        throw new Error('Install @volter/world-core 3.0.37 or later in this project to seed browsers.', { cause: error });
-      });
-      const initial = snapshots.get(call.browser)!;
-      const hostname = new URL(call.path).hostname;
-      if (initial.storageState.cookies.some(cookie => browserHelper!.cookieMatchesHost(cookie, hostname))
-        || initial.storageState.origins.some(origin => new URL(origin.origin).hostname === hostname)) continue;
-    }
-    const headers = { ...(call.body !== undefined ? { 'content-type': 'application/json' } : {}), ...(call.headers ?? {}) };
-    const form = /^application\\/x-www-form-urlencoded\\b/i.test(new Headers(headers).get('content-type') ?? '');
-    const body = call.body === undefined ? undefined : form
-      ? new URLSearchParams(Object.entries(call.body as Record<string, unknown>).map(([key, value]) => [key, String(value)]))
-      : JSON.stringify(call.body);
-    if (call.browser && !clients.has(call.browser)) {
-      clients.set(call.browser, await browserHelper!.browser(call.browser));
-    }
-    const client = call.browser ? clients.get(call.browser)! : null;
-    const res = await (client ? client.fetch : fetch)(client ? call.path : \`\${base.replace(/\\/$/, '')}\${call.path}\`, {
-      method: call.method,
-      headers, ...(body === undefined ? {} : { body }),
-    });
-    if (!res.ok) throw new Error(\`${vendor} seed: \${call.method} \${call.path}: \${res.status} \${await res.text()}\`);
->>>>>>> origin/main
+    restoreClock();
   }
 }
 `;