@ai-ecoverse/slicc-kernel 1.54.9 → 1.56.0

package/dist/node.js

@@ -1693,6 +1693,7 @@ var LAST_UID = 6e4;
 var USERS_GROUP = "users";
 var HOME_DIR = /^\/home\/[^/]+$/;
 var SYSTEM_PNPM_HOME = "/usr/local/share/pnpm";
+var PNPM_CONFIG = "minimumReleaseAge: 1440\n";
 var isId = (text) => text !== void 0 && /^\d+$/.test(text);
 function lines(text) {
   return text.split("\n").filter((line, i, all) => line !== "" || i < all.length - 1);
@@ -1748,6 +1749,7 @@ function userEnv(account, system) {
     USER: account.name,
     LOGNAME: account.name,
     PNPM_HOME: pnpm,
+    NPM_CONFIG_PREFIX: account.uid === 0 ? "/usr/local" : `${account.home}/.local`,
     PATH: `${pnpm}/bin:/usr/local/bin:/usr/bin:/bin`
   };
 }
@@ -1772,6 +1774,18 @@ var UserDb = class {
       group: parseGroup(await this.read(GROUP, DEFAULT_GROUP))
     };
   }
+  async provision(row) {
+    const pnpm = `${row.home}/.local/share/pnpm`;
+    if (!await this.fs.exists(pnpm)) {
+      await this.fs.mkdir(pnpm, { recursive: true });
+      await this.fs.chmod(pnpm, row.name.startsWith("scoop-") ? 488 : 448);
+    }
+    const config = `${row.home}/.config/pnpm/config.yaml`;
+    if (!await this.fs.exists(config)) {
+      await this.fs.mkdir(`${row.home}/.config/pnpm`, { recursive: true });
+      await this.fs.writeFile(config, PNPM_CONFIG);
+    }
+  }
   async commit(passwd, group, then) {
     const before = [await this.read(PASSWD, DEFAULT_PASSWD), await this.read(GROUP, DEFAULT_GROUP)];
     try {
@@ -1845,6 +1859,7 @@ var UserDb = class {
       const groups = parsed(group);
       const found = users.find((r) => r.name === name2);
       if (found) {
+        if (found.uid >= FIRST_UID && found.uid <= LAST_UID) await this.provision(found);
         remember();
         return this.account(found, groups);
       }
@@ -1863,6 +1878,7 @@ var UserDb = class {
       const fresh = !await this.fs.exists(home);
       await this.fs.mkdir(home, { recursive: true });
       try {
+        await this.provision(row);
         await this.fs.mkdir("/etc", { recursive: true });
         await this.commit(formatPasswd(passwd), formatGroup(group));
       } catch (err) {
@@ -2749,7 +2765,7 @@ var OpfsFs = class {
     const parent = await this.locate(parentOf2(path), true);
     if (parent.handle?.kind !== "directory") throw fsError("ENOTDIR", path);
     await parent.handle.getDirectoryHandle(baseOf(path), { create: true });
-    this.touch(parent.path);
+    this.touch(parent.path, `${parent.path === "/" ? "" : parent.path}/${baseOf(path)}`);
   }
   async rm(path, options = {}) {
     let found;
@@ -4156,17 +4172,22 @@ async function followLinks(fs, path) {
   }
   return current;
 }
-function withCommandDirs(fs, names) {
+function withCommandDirs(fs, names, userDir = async () => void 0) {
   async function children2(path) {
     if (path === "/") return ["bin", "usr"];
     if (path === "/usr") return ["bin"];
     if (path === "/bin" || path === "/usr/bin") return [...await names()];
-    return void 0;
+    const own = await userDir(path);
+    return own?.size ? [...own] : void 0;
   }
   async function virtual(path) {
     if (path === "/usr" || path === "/bin" || path === "/usr/bin") return synthetic(true, path);
     const name2 = COMMAND.exec(path)?.[1];
-    return name2 !== void 0 && (await names()).has(name2) ? synthetic(false, path) : void 0;
+    if (name2 !== void 0) return (await names()).has(name2) ? synthetic(false, path) : void 0;
+    if ((await userDir(path))?.size) return synthetic(true, path);
+    const slash = path.lastIndexOf("/");
+    const own = await userDir(path.slice(0, slash));
+    return own?.has(path.slice(slash + 1)) ? synthetic(false, path) : void 0;
   }
   async function linked(path) {
     return await virtual(path) ?? virtual(await followLinks(fs, path));
@@ -12777,8 +12798,11 @@ var Launcher = class {
   createWorker;
   modulesDir;
   env;
-  catalog;
-  binfmts;
+  catalogs = /* @__PURE__ */ new Map();
+  ownCatalogs = /* @__PURE__ */ new Map();
+  binfmts = /* @__PURE__ */ new Map();
+  scopes;
+  unwatchScopes = () => void 0;
   warned = /* @__PURE__ */ new Set();
   compiled = /* @__PURE__ */ new Map();
   processes = /* @__PURE__ */ new Map();
@@ -12858,7 +12882,11 @@ var Launcher = class {
       ca: this.ca
     });
     enableCdp(this.net, this.cdp);
-    const fs = withCommandDirs(this.base, async () => new Set((await this.commands()).keys()));
+    const fs = withCommandDirs(
+      this.base,
+      async () => new Set((await this.commands()).keys()),
+      (dir) => this.userCommandDir(dir)
+    );
     this.nodes = new VfsNodes(fs, (path) => this.released(path));
     this.nodes.keepsOnDisk = true;
     this.openFiles.add(this.nodes);
@@ -12876,35 +12904,99 @@ var Launcher = class {
     this.fs = this.unlinked.wrap(keepingOpen(fs, this.nodes));
     this.users = new UserDb(this.fs);
     void this.unlinked.sweep("/");
-    this.watchers.watch([this.modulesDir, this.pnpmHome], { recursive: true }, () => {
-      this.catalog = void 0;
-      this.binfmts = void 0;
+    this.watchers.watch(
+      [this.modulesDir, this.pnpmHome],
+      { recursive: true },
+      () => this.resetCatalogs()
+    );
+    this.watchers.watch([PASSWD], { recursive: false }, () => {
+      this.scopes = void 0;
+      this.resetCatalogs();
     });
   }
   setRoutes(table) {
     this.routes.set(table);
   }
-  commands() {
-    this.catalog ??= this.roots().then((roots) => scanCommands(this.base, roots));
-    return this.catalog;
+  commands(scope = "") {
+    let found = this.catalogs.get(scope);
+    if (!found) {
+      found = this.roots(scope).then((roots) => scanCommands(this.base, roots));
+      this.catalogs.set(scope, found);
+    }
+    return found;
   }
-  interpreters() {
-    this.binfmts ??= this.roots().then(
-      (roots) => scanBinfmts(this.base, roots, (message3) => {
-        if (this.warned.has(message3)) return;
-        this.warned.add(message3);
-        console.warn(message3);
-      })
-    );
-    return this.binfmts;
+  ownCommands(scope) {
+    let found = this.ownCatalogs.get(scope);
+    if (!found) {
+      found = pnpmGlobalRoots(this.base, scope).then((roots) => scanCommands(this.base, roots)).then((commands) => new Set(commands.keys()));
+      this.ownCatalogs.set(scope, found);
+    }
+    return found;
+  }
+  interpreters(scope = "") {
+    let found = this.binfmts.get(scope);
+    if (!found) {
+      found = this.roots(scope).then(
+        (roots) => scanBinfmts(this.base, roots, (message3) => {
+          if (this.warned.has(message3)) return;
+          this.warned.add(message3);
+          console.warn(message3);
+        })
+      );
+      this.binfmts.set(scope, found);
+    }
+    return found;
   }
-  async roots() {
-    return [this.modulesDir, ...await pnpmGlobalRoots(this.base, this.pnpmHome)];
+  async roots(scope = "") {
+    const system = [this.modulesDir, ...await pnpmGlobalRoots(this.base, this.pnpmHome)];
+    return scope ? [...await pnpmGlobalRoots(this.base, scope), ...system] : system;
+  }
+  resetCatalogs() {
+    this.catalogs.clear();
+    this.ownCatalogs.clear();
+    this.binfmts.clear();
+  }
+  userScopes() {
+    this.scopes ??= this.users.list().then(
+      (accounts) => {
+        const users = accounts.filter((account) => account.uid !== 0);
+        const homes = users.map((account) => pnpmHomeOf(account, this.pnpmHome));
+        this.unwatchScopes();
+        this.unwatchScopes = this.watchers.watch(
+          homes,
+          { recursive: true },
+          () => this.resetCatalogs()
+        );
+        return {
+          byUid: new Map(users.map((account, i) => [account.uid, homes[i]])),
+          byBin: new Map(homes.map((home) => [`${home}/bin`, home]))
+        };
+      },
+      () => ({ byUid: /* @__PURE__ */ new Map(), byBin: /* @__PURE__ */ new Map() })
+    );
+    return this.scopes;
+  }
+  async userCommandDir(dir) {
+    const scope = (await this.userScopes()).byBin.get(dir);
+    return scope === void 0 ? void 0 : this.ownCommands(scope);
+  }
+  async scopeOf(uid) {
+    return (await this.userScopes()).byUid.get(uid) ?? "";
+  }
+  async commandAt(file, scope) {
+    const system = COMMAND2.exec(file)?.[1];
+    if (system !== void 0) return (await this.commands()).get(system);
+    if (!file.includes("/")) return (await this.commands(scope)).get(file);
+    const slash = file.lastIndexOf("/");
+    const owner = (await this.userScopes()).byBin.get(file.slice(0, slash));
+    if (owner === void 0 || !(await this.ownCommands(owner)).has(file.slice(slash + 1))) {
+      return void 0;
+    }
+    return (await this.commands(owner)).get(file.slice(slash + 1));
   }
-  async resolve(file, argv0, cwd) {
-    const name2 = COMMAND2.exec(file)?.[1] ?? (file.includes("/") ? void 0 : file);
-    if (name2 !== void 0) {
-      const command = (await this.commands()).get(name2);
+  async resolve(file, argv0, cwd, scope = "") {
+    if (!file.includes("/") || COMMAND2.test(file)) {
+      const command = await this.commandAt(file, scope);
       return command && !command.script ? targetOf(command) : void 0;
     }
     const path = this.fs.resolvePath(cwd, file);
@@ -12915,6 +13007,8 @@ var Launcher = class {
       const byPath = !COMMAND2.test(path) && (await this.commands()).get(linked)?.argv0Path === true;
       return target && byPath ? { ...target, argv0: path } : target;
     }
+    const own = await this.commandAt(glue, scope);
+    if (own) return own.script ? void 0 : targetOf(own);
     const head = await this.head(glue);
     if (!head) return void 0;
     if (isWasm(head)) {
@@ -12937,45 +13031,45 @@ var Launcher = class {
       return void 0;
     }
   }
-  async scriptCommand(file) {
-    const name2 = COMMAND2.exec(file)?.[1] ?? (file.includes("/") ? void 0 : file);
-    if (name2 === void 0) return void 0;
-    const command = (await this.commands()).get(name2);
+  async scriptCommand(file, cwd, scope) {
+    const direct = !file.includes("/") || COMMAND2.test(file);
+    const at = direct ? file : await followLinks(this.base, this.fs.resolvePath(cwd, file));
+    const command = await this.commandAt(at, scope);
     return command?.script ? command : void 0;
   }
-  async interpreted(file, argv, cwd, depth = 0) {
-    const command = await this.scriptCommand(file);
+  async interpreted(file, argv, cwd, scope, depth = 0) {
+    const command = await this.scriptCommand(file, cwd, scope);
     const script = command?.script ?? this.fs.resolvePath(cwd, file);
     const head = await this.head(script);
     if (!head) return void 0;
-    const binfmt = isWasm(head) ? void 0 : binfmtOf(await this.interpreters(), script);
+    const binfmt = isWasm(head) ? void 0 : binfmtOf(await this.interpreters(scope), script);
     const words = shebang(head) ?? (binfmt ? [binfmt] : void 0);
     if (!words) return void 0;
     if (baseName(words[0]) === "env") words.shift();
     const [interp, ...rest2] = words;
     const arg = rest2.join(" ");
     const passed = [...arg ? [arg] : [], command ? script : file, ...argv.slice(1)];
-    const found = interp ? await this.resolve(interp, interp, cwd) : void 0;
+    const found = interp ? await this.resolve(interp, interp, cwd, scope) : void 0;
     if (!found) {
-      if (!interp || depth >= MAX_INTERPRETERS || !await this.scriptCommand(interp)) {
+      if (!interp || depth >= MAX_INTERPRETERS || !await this.scriptCommand(interp, cwd, scope)) {
         return void 0;
       }
-      const inner = await this.interpreted(interp, [interp, ...passed], cwd, depth + 1);
+      const inner = await this.interpreted(interp, [interp, ...passed], cwd, scope, depth + 1);
       return inner && { ...inner, target: withScriptEnv(inner.target, command) };
     }
     const target = withScriptEnv(found, command);
     return { target, args: [...target.prefix ?? [], ...passed] };
   }
-  async plan(file, argv, cwd) {
-    const direct = await this.resolve(file, argv[0] ?? file, cwd);
+  async plan(file, argv, cwd, scope) {
+    const direct = await this.resolve(file, argv[0] ?? file, cwd, scope);
     if (direct) return { target: direct, args: [...direct.prefix ?? [], ...argv.slice(1)] };
-    return this.interpreted(file, argv, cwd);
+    return this.interpreted(file, argv, cwd, scope);
   }
-  async unrunnable(file, cwd) {
+  async unrunnable(file, cwd, scope) {
     const path = this.fs.resolvePath(cwd, file);
     const head = await this.base.readFileBuffer(path).catch(() => null);
     if (!head || head[0] === 35 && head[1] === 33) return "ENOENT";
-    return binfmtOf(await this.interpreters(), path) ? "ENOENT" : "ENOEXEC";
+    return binfmtOf(await this.interpreters(scope), path) ? "ENOENT" : "ENOEXEC";
   }
   module(path) {
     return this.base.stat(path).then((st) => {
@@ -13185,10 +13279,11 @@ var Launcher = class {
   }
   spawner(ppid, report) {
     return async (req, fds) => {
-      const planned = await this.plan(req.file, req.argv, req.cwd);
+      const scope = await this.scopeOf(this.credOf(ppid).euid);
+      const planned = await this.plan(req.file, req.argv, req.cwd, scope);
       if (!planned) {
         await fds.closeAll();
-        throw new SpawnError(await this.unrunnable(req.file, req.cwd));
+        throw new SpawnError(await this.unrunnable(req.file, req.cwd, scope));
       }
       const exec = req.exec ? { exec: true } : {};
       const deciding = req.exec ? void 0 : this.undecided(ppid);
@@ -13490,18 +13585,18 @@ var Launcher = class {
       ...account.umask !== void 0 ? { umask: account.umask } : {}
     };
   }
-  async starting(argv, dir) {
-    this.catalog = void 0;
-    this.binfmts = void 0;
+  async starting(argv, dir, account) {
+    this.resetCatalogs();
+    const scope = account.uid === 0 ? "" : pnpmHomeOf(account, this.pnpmHome);
     const start2 = dir ?? "/";
     const cwd = await physicalPathAsync(this.base, start2.startsWith("/") ? start2 : `/${start2}`);
     const [file = ""] = argv;
     await this.base.mkdir(cwd, { recursive: true });
-    return { cwd, file, planned: await this.plan(file, argv, cwd) };
+    return { cwd, file, planned: await this.plan(file, argv, cwd, scope) };
   }
   async openTerminal(argv, options) {
     const account = await this.account(options.user);
-    const { cwd, file, planned } = await this.starting(argv, options.cwd);
+    const { cwd, file, planned } = await this.starting(argv, options.cwd, account);
     if (!planned) throw new Error(`${file}: command not found`);
     let leader = 0;
     const tty = new KernelTty(
@@ -13544,7 +13639,7 @@ var Launcher = class {
   }
   async run(argv, options = {}) {
     const account = await this.account(options.user);
-    const { cwd, file, planned } = await this.starting(argv, options.cwd);
+    const { cwd, file, planned } = await this.starting(argv, options.cwd, account);
     const env = this.environment(cwd, options.env, account);
     const out = [];
     const err = [];