@cjhyy/code-shell-server 0.9.35 → 0.9.37

package/dist/project-runtime/registry.js

@@ -2,6 +2,7 @@ import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { constants, chmodSync, closeSync, existsSync, fstatSync, fsyncSync, lstatSync, mkdirSync, openSync, readSync, renameSync, rmSync, writeFileSync, } from "node:fs";
 import { join, resolve } from "node:path";
 import { acquireProjectControllerLock } from "./lock.js";
+import { CLOUD_ADOPTION_PENDING, isCloudAccountBinding, } from "./account-binding.js";
 const UUID = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/;
 const TOKEN = /^[A-Za-z0-9_-]{43}$/;
 const STATUSES = new Set(["stopped", "starting", "running", "stopping", "error"]);
@@ -58,6 +59,7 @@ export class ProjectRegistry {
     controllerLock;
     diskDigest;
     markerEstablished = false;
+    storageFailed = false;
     constructor(dataDir, now = Date.now, io = {}) {
         this.now = now;
         this.io = io;
@@ -72,6 +74,16 @@ export class ProjectRegistry {
         this.marker = join(this.directory, "initialized");
         this.controllerLock = acquireProjectControllerLock(this.directory);
         try {
+            if (!this.io.offlineAccountAdoption) {
+                try {
+                    lstatSync(join(this.directory, CLOUD_ADOPTION_PENDING));
+                    throw new Error("Cloud account adoption is incomplete; retry its explicit offline transaction.");
+                }
+                catch (error) {
+                    if (error.code !== "ENOENT")
+                        throw error;
+                }
+            }
             if (existsSync(this.marker)) {
                 if (privateFileBytes(this.marker, 16).toString() !== "1\n")
                     throw new Error("Project initialization marker is corrupt.");
@@ -109,6 +121,8 @@ export class ProjectRegistry {
             throw new Error("Stop all projects before restoring an installation.");
         const next = structuredClone(this.data);
         next.installationId = randomUUID();
+        if (next.accountBinding)
+            next.accountBinding.managementEpoch = randomUUID();
         for (const project of next.projects) {
             if (project.generation > 0)
                 project.generation += 1;
@@ -122,15 +136,43 @@ export class ProjectRegistry {
         this.assertStorage();
         return this.data.installationId;
     }
+    get accountBinding() {
+        this.assertStorage();
+        return this.data.accountBinding && { ...this.data.accountBinding };
+    }
+    /** Offline migration only; the caller must durably preserve source evidence first. */
+    bindAccount(binding) {
+        this.assertStorage();
+        if (this.data.version !== 1 ||
+            this.data.accountBinding !== undefined ||
+            !isCloudAccountBinding(binding) ||
+            this.data.owners.length !== 1 ||
+            this.data.owners[0].id !== binding.ownerId ||
+            this.data.projects.some((project) => project.status !== "stopped"))
+            throw new Error("Cloud adoption requires one explicit legacy owner and stopped projects.");
+        const next = structuredClone(this.data);
+        // The real historical registry rejects version 2. Unknown metadata alone
+        // cannot prevent an old controller from continuing its username authority.
+        next.version = 2;
+        next.accountBinding = { ...binding };
+        this.write(next);
+        this.data = next;
+    }
     validate(data = this.data) {
         if (!data ||
-            data.version !== 1 ||
+            (data.version !== 1 && data.version !== 2) ||
             !UUID.test(data.installationId) ||
             !Array.isArray(data.owners) ||
             !Array.isArray(data.projects) ||
             data.owners.length > 128 ||
             data.projects.length > 128)
             throw new Error("Project registry is corrupt; restore its backup");
+        if ((data.version === 1 && data.accountBinding !== undefined) ||
+            (data.version === 2 &&
+                (!isCloudAccountBinding(data.accountBinding) ||
+                    data.owners.length !== 1 ||
+                    data.owners[0]?.id !== data.accountBinding.ownerId)))
+            throw new Error("Cloud account ownership is missing or corrupt; restore its backup.");
         const owners = new Set();
         const names = new Set();
         for (const owner of data.owners) {
@@ -174,6 +216,8 @@ export class ProjectRegistry {
         }
     }
     assertStorage() {
+        if (this.storageFailed)
+            throw new Error("Project registry durability failed; restart and diagnose before continuing.");
         this.controllerLock.assertHeld();
         if (this.markerEstablished && privateFileBytes(this.marker, 16).toString() !== "1\n")
             throw new Error("Project initialization marker changed.");
@@ -192,15 +236,29 @@ export class ProjectRegistry {
             throw new Error("Project registry is too large.");
         const file = join(this.directory, `.registry-${randomUUID()}.tmp`);
         let fd;
+        let committed = false;
         try {
             fd = openSync(file, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | (constants.O_NOFOLLOW ?? 0), 0o600);
             writeFileSync(fd, bytes);
-            fsyncSync(fd);
+            (this.io.fsync ?? fsyncSync)(fd);
             closeSync(fd);
             fd = undefined;
             this.assertStorage();
             (this.io.rename ?? renameSync)(file, this.file);
+            committed = true;
             this.diskDigest = digest(bytes);
+            const directory = openSync(this.directory, constants.O_RDONLY);
+            try {
+                (this.io.fsync ?? fsyncSync)(directory);
+            }
+            finally {
+                closeSync(directory);
+            }
+        }
+        catch (error) {
+            if (committed)
+                this.storageFailed = true;
+            throw error;
         }
         finally {
             if (fd !== undefined)
@@ -214,11 +272,13 @@ export class ProjectRegistry {
     }
     list(username) {
         this.assertStorage();
+        this.requireLegacy();
         const owner = this.data.owners.find((item) => item.username === username);
         return this.data.projects.filter((item) => item.ownerId === owner?.id).map(projectView);
     }
     get(username, id) {
         this.assertStorage();
+        this.requireLegacy();
         const owner = this.data.owners.find((item) => item.username === username);
         const project = this.data.projects.find((item) => item.id === id && item.ownerId === owner?.id);
         if (!project)
@@ -227,6 +287,35 @@ export class ProjectRegistry {
     }
     create(username, name) {
         this.assertStorage();
+        this.requireLegacy();
+        return this.createForOwner(username, name);
+    }
+    listAccount(ownerId) {
+        this.requireAccountOwner(ownerId);
+        return this.data.projects.filter((item) => item.ownerId === ownerId).map(projectView);
+    }
+    getAccount(ownerId, id) {
+        this.requireAccountOwner(ownerId);
+        const project = this.data.projects.find((item) => item.id === id && item.ownerId === ownerId);
+        if (!project)
+            throw new ProjectRegistryError(404, "找不到这个项目。");
+        return { ...project };
+    }
+    createAccount(ownerId, name) {
+        this.requireAccountOwner(ownerId);
+        // This username is internal legacy metadata, never the Account display name.
+        return this.createForOwner(this.data.owners[0].username, name);
+    }
+    requireLegacy() {
+        if (this.data.version !== 1)
+            throw new ProjectRegistryError(403, "此 Cloud 已采用明确的账号归属，请通过云账号管理。");
+    }
+    requireAccountOwner(ownerId) {
+        this.assertStorage();
+        if (this.data.version !== 2 || this.data.accountBinding?.ownerId !== ownerId)
+            throw new ProjectRegistryError(403, "此账号没有 Cloud 管理权限。");
+    }
+    createForOwner(username, name) {
         if (typeof name !== "string" ||
             !name.trim() ||
             name.trim().length > 80 ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-server",
-  "version": "0.9.35",
+  "version": "0.9.37",
   "description": "CodeShell server transport layer — mobile remote HTTP/WS host, pairing, passcode gate, tunnel, rooms, uploads, and session/attachment services. Electron-free; precursor of the auth gateway.",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,7 +49,8 @@
   },
   "bin": {
     "code-shell-serve": "./dist/bin/code-shell-serve.js",
-    "code-shell-settings-recovery": "./dist/bin/code-shell-settings-recovery.js"
+    "code-shell-settings-recovery": "./dist/bin/code-shell-settings-recovery.js",
+    "code-shell-cloud-account": "./dist/bin/code-shell-cloud-account.js"
   },
   "files": [
     "dist"
@@ -60,13 +61,13 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-capability-coding": "0.9.35",
-    "@cjhyy/code-shell-core": "0.9.35",
-    "@cjhyy/code-shell-web": "0.9.35",
+    "@cjhyy/code-shell-capability-coding": "0.9.37",
+    "@cjhyy/code-shell-core": "0.9.37",
+    "@cjhyy/code-shell-web": "0.9.37",
     "@modelcontextprotocol/sdk": "^1.31.0",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.0",
-    "@cjhyy/code-shell-link": "0.9.35"
+    "@cjhyy/code-shell-link": "0.9.37"
   },
   "engines": {
     "node": ">=20.10"