vercel-vm-factory 0.2.8 → 0.5.8

package/README.md

@@ -1,6 +1,6 @@
 # Vercel VM Factory
 
-Create a tiny Vercel Container deployment: copy `wsterm` from `ghcr.io/v1xingyue/ws-shell:v1.1.alpine` into a selected base image, then deploy with Vercel CLI.
+Create a tiny Vercel Container deployment: copy `wsterm` from `ghcr.io/v1xingyue/ws-shell:v1.8.alpine` into a selected base image, then deploy with Vercel CLI.
 
 ```bash
 npx vercel-vm-factory create \

package/deploy-vm.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
+import { mkdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
 import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
@@ -20,8 +20,13 @@ const workspaceRoot = process.cwd();
 const stateRoot = path.join(homedir(), ".vercel-vm-factory");
 const defaultsPath = path.join(stateRoot, "defaults.json");
 const legacyDefaultsPath = path.join(scriptRoot, ".defaults.json");
-const defaults = {
+const codeDefaults = { base: "alpine", from: defaultWsShellImage };
+const packagedDefaults = {
   ...(await readDefaults(legacyDefaultsPath)),
+  ...codeDefaults,
+};
+let defaults = {
+  ...packagedDefaults,
   ...(await readDefaults(defaultsPath)),
 };
 const colorEnabled = output.isTTY && !process.env.NO_COLOR;
@@ -57,6 +62,7 @@ try {
 
 async function main() {
   printHeader();
+  defaults = await syncDefaults();
   await ensureVercelInstalled();
   await ensureVercelLogin();
 
@@ -310,10 +316,7 @@ async function doctor() {
   printKeyValue("base", defaults.base || "not set");
   printKeyValue("project", defaults.project || "not set");
   printKeyValue("scope", defaults.scope || "not set");
-  printKeyValue(
-    "source image",
-    defaults.from || "ghcr.io/v1xingyue/ws-shell:v1.1.alpine",
-  );
+  printKeyValue("source image", defaults.from || defaultWsShellImage);
   printKeyValue("auth mode", defaults["auth-mode"] || "not set");
   printKeyValue(
     "auth user",
@@ -479,12 +482,47 @@ async function readDefaults(file) {
   }
 }
 
+async function syncDefaults() {
+  const current = await readDefaults(defaultsPath);
+  const codeMtime = Math.max(
+    await readMtime(import.meta.filename),
+    await readMtime(legacyDefaultsPath),
+  );
+  const homeMtime = await readMtime(defaultsPath);
+  const latest =
+    homeMtime > codeMtime
+      ? { ...packagedDefaults, ...current }
+      : { ...current, ...packagedDefaults };
+
+  if (
+    JSON.stringify(cleanDefaults(current)) !==
+    JSON.stringify(cleanDefaults(latest))
+  )
+    await writeDefaults(defaultsPath, latest);
+  return cleanDefaults(latest);
+}
+
+async function readMtime(file) {
+  try {
+    return (await stat(file)).mtimeMs;
+  } catch {
+    return 0;
+  }
+}
+
 async function writeDefaults(file, data) {
+  const clean = cleanDefaults(data);
+  await mkdir(path.dirname(file), { recursive: true });
+  await writeFile(file, `${JSON.stringify(clean, null, 2)}\n`);
+}
+
+function cleanDefaults(data) {
   const clean = Object.fromEntries(
     Object.entries(data).filter(([, value]) => value),
   );
-  await mkdir(path.dirname(file), { recursive: true });
-  await writeFile(file, `${JSON.stringify(clean, null, 2)}\n`);
+  return Object.fromEntries(
+    Object.entries(clean).sort(([a], [b]) => a.localeCompare(b)),
+  );
 }
 
 function mask(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel-vm-factory",
-  "version": "0.2.8",
+  "version": "0.5.8",
   "description": "Create Vercel Container deployments for ws-shell from selectable base images.",
   "license": "MIT",
   "type": "module",