dewctl 0.6.0 → 0.6.1

package/examples/AGENTS.md

@@ -62,8 +62,9 @@ A new look usually means changing the first three together.
   ([colors](https://alpha.dewdrop.world/docs/renderer#colors)).
 - **Describe what the camera sees, in the style's words:** "the back of an owl's head" behind a character,
   "a plasticine tree". Use one description for each kind of object.
-- **Keep color words in step with the colors.** "Terracotta" on a pale roof came out red, and "pale cream wall"
-  came out white on a dark wall. Name the material without its lightness
+- **Keep color words in step with the colors.** A color or lightness word overrides the mesh's color: a pale roof
+  described as "terracotta" turns red, and a dark wall described as "pale cream" turns white. Name the material
+  without its lightness
   ([descriptions](https://alpha.dewdrop.world/docs/renderer#descriptions)).
 - A group's description reaches every mesh under it that has none of its own; `null` gives none, and a mesh's
   `name` is never used ([scene graph](https://alpha.dewdrop.world/docs/descriptions)).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dewctl",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Build and publish three.js games on Dewdrop.",
   "license": "MIT",
   "type": "module",

package/src/client.js

@@ -69,13 +69,14 @@ export class Client {
     if(result.release!==bundle.id)throw new Error('Dewdrop stored a different release than was uploaded, so nothing was changed. Try again.');
     return result;
   }
-  activate(game,release,signal){return this.point(game,'dev',release,signal);}
+  activate(game,release,signal,started){return this.point(game,'dev',release,signal,started);}
   stop(game,signal){return this.point(game,'dev',null,signal);}
   publish(game,release,signal){return this.point(game,'live',release,signal);}
   // Points a version at a release, then follows the game until that version is ready, fails, or somebody points it
-  // elsewhere. The PUT answers with the game, so it is the first look.
-  async point(game,version,release,signal) {
+  // elsewhere. The PUT answers with the game, so it is the first look, handed to `started` before the wait.
+  async point(game,version,release,signal,started) {
     let state=await this.api(`/v1/games/${game}/${version}`,{method:'PUT',body:{release},signal});
+    started?.(state);
     if(release===null&&version==='live')return state;
     const doing=release===null?'Stopping the dev version':version==='dev'?'Starting the dev version':'Publishing',deadline=Date.now()+this.timeoutMs;
     for(;;) {

package/src/main.js

@@ -189,8 +189,8 @@ async function main() {
   }
   if(flags.release){
     const release=await releaseId(client,game,flags.release);
-    const state=await client.activate(game,release,signal);
-    console.log(`Playing ${release.slice(0,12)} at ${devPlayUrl(state)}`);return;
+    await client.activate(game,release,signal,state=>console.log(`Starting ${release.slice(0,12)} at ${devPlayUrl(state)}`));
+    console.log('Ready to play.');return;
   }
   if(flags.watch)await watch(project,client,{signal,reread:()=>readProject(project.root)});
   else if((await deploy(project,client,{signal})).changed)throw new Error(`Files changed during the build, so nothing was uploaded. Run ${RUN} dev again, or ${RUN} dev --watch to rebuild on every save.`);

package/src/project.js

@@ -166,7 +166,7 @@ const SDK_RANGE='^0.6.0';
 const CLI_RANGE=`^${JSON.parse(readFileSync(new URL('../package.json',import.meta.url),'utf8')).version}`;
 // The games a new one can start from: Blank, which ships with this CLI, and the starter games in the public
 // starter-templates repository, a folder each, at the commit this release pins.
-const STARTERS={repo:'DewdropLabs/starter-templates',commit:'4247a60d29f5477b94b498fcd31a4c3c0e873cc0'};
+const STARTERS={repo:'DewdropLabs/starter-templates',commit:'8d7743c1f13ca979daf3afe92063ee12a396e52e'};
 const TEMPLATES={
   blank:['Blank','a cube and a style prompt, the smallest game'],
   'golden-glide':['Golden Glide','flight over golden-hour countryside, in gouache'],
@@ -180,11 +180,14 @@ const EXAMPLES=fileURLToPath(new URL('../examples/',import.meta.url)),BLANK=join
 export async function chooseTemplate(input=process.stdin, output=process.stdout) {
   const ids=Object.keys(TEMPLATES),ask=`Choose 1–${ids.length} [1]: `;
   output.write(`Start from:\n${ids.map((id,i)=>`  ${i+1}  ${TEMPLATES[id][0].padEnd(14)}${TEMPLATES[id][1]}`).join('\n')}\n${ask}`);
-  for await (const line of createInterface({input})) {
-    const answer=line.trim()||'1',id=/^\d$/.test(answer)&&ids[answer-1];
-    if(id)return id;
-    output.write(ask);
-  }
+  // Closing the reader leaves the terminal's input open, which would keep the CLI running once init is done.
+  try {
+    for await (const line of createInterface({input})) {
+      const answer=line.trim()||'1',id=/^\d$/.test(answer)&&ids[answer-1];
+      if(id)return id;
+      output.write(ask);
+    }
+  } finally { input.pause(); }
   throw new Error('No game was chosen to start from.');
 }
 // A starter game's files, from the repository's tarball at the pinned commit (or the one DEWDROP_STARTERS names, for

package/src/watch.js

@@ -22,8 +22,8 @@ export async function deploy(project,client,{signal,log=console.log}={}) {
   const parts=Math.max(1,Math.ceil(bundle.body.length/PART_BYTES));
   log(`Uploading ${bundle.files} file${bundle.files===1?'':'s'} (${size(bundle.bytes)})${parts>1?` in ${parts} parts`:''}…`);
   await client.upload(project.game,bundle,signal);
-  const game=await client.activate(project.game,bundle.id,signal);
-  log(`Playing ${bundle.id.slice(0,12)} at ${devPlayUrl(game)}`);
+  await client.activate(project.game,bundle.id,signal,game=>log(`Starting ${bundle.id.slice(0,12)} at ${devPlayUrl(game)}`));
+  log('Ready to play.');
   return {changed:false};
 }