ryugi-artifacts 1.47.0 → 1.48.0

package/dist/cli.cjs

@@ -6047,14 +6047,14 @@ function customAlphabet(alphabet, defaultSize = 21) {
   });
   let alphabetLen = alphabet.length;
   let mask = (2 << 31 - Math.clz32(alphabetLen - 1 | 1)) - 1;
-  let pool2 = "";
-  let poolOffset2 = 0;
+  let pool = "";
+  let poolOffset = 0;
   let poolNext = 0;
   return (size = defaultSize) => {
     size |= 0;
     if (size < 0) throw new RangeError("Wrong ID size");
     if (size === 0) return "";
-    if (poolOffset2 + size > pool2.length) {
+    if (poolOffset + size > pool.length) {
       let target = Math.max(poolNext, size);
       poolNext = Math.min(target * 16, POOL_MAX);
       let buffer = Buffer.allocUnsafe(target);
@@ -6079,11 +6079,11 @@ function customAlphabet(alphabet, defaultSize = 21) {
           }
         }
       }
-      pool2 = buffer.toString("latin1");
-      poolOffset2 = 0;
+      pool = buffer.toString("latin1");
+      poolOffset = 0;
     }
-    poolOffset2 += size;
-    return pool2.substring(poolOffset2 - size, poolOffset2);
+    poolOffset += size;
+    return pool.substring(poolOffset - size, poolOffset);
   };
 }
 var nanoid = customAlphabet(urlAlphabet);
@@ -18037,69 +18037,6 @@ setPrototypeOf(Document4, Document2).prototype = Document2.prototype;
 // node_modules/.pnpm/@haklex+rich-litexml@0.61.1_typescript@5.9.3/node_modules/@haklex/rich-litexml/dist/node.mjs
 registerParseHTML((html) => parseHTML(html).document);
 
-// node_modules/.pnpm/nanoid@5.1.16/node_modules/nanoid/index.js
-var import_node_crypto = require("node:crypto");
-var POOL_SIZE_MULTIPLIER = 128;
-var pool;
-var poolOffset;
-function fillPool(bytes) {
-  if (bytes < 0) throw new RangeError("Wrong ID size");
-  try {
-    if (!pool || pool.length < bytes) {
-      pool = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER);
-      import_node_crypto.webcrypto.getRandomValues(pool);
-      poolOffset = 0;
-    } else if (poolOffset + bytes > pool.length) {
-      import_node_crypto.webcrypto.getRandomValues(pool);
-      poolOffset = 0;
-    }
-  } catch (e) {
-    pool = void 0;
-    throw e;
-  }
-  poolOffset += bytes;
-}
-function random2(bytes) {
-  fillPool(bytes |= 0);
-  return pool.subarray(poolOffset - bytes, poolOffset);
-}
-function customRandom2(alphabet, defaultSize, getRandom) {
-  let safeByteCutoff = 256 - 256 % alphabet.length;
-  if (safeByteCutoff === 256) {
-    let mask = alphabet.length - 1;
-    return (size = defaultSize) => {
-      if (!size) return "";
-      let id = "";
-      while (true) {
-        let bytes = getRandom(size);
-        let i = size;
-        while (i--) {
-          id += alphabet[bytes[i] & mask];
-          if (id.length >= size) return id;
-        }
-      }
-    };
-  }
-  let step = Math.ceil(1.6 * 256 * defaultSize / safeByteCutoff);
-  return (size = defaultSize) => {
-    if (!size) return "";
-    let id = "";
-    while (true) {
-      let bytes = getRandom(step);
-      let i = step;
-      while (i--) {
-        if (bytes[i] < safeByteCutoff) {
-          id += alphabet[bytes[i] % alphabet.length];
-          if (id.length >= size) return id;
-        }
-      }
-    }
-  };
-}
-function customAlphabet2(alphabet, size = 21) {
-  return customRandom2(alphabet, size, random2);
-}
-
 // src/server/document-codec.ts
 var BLOCK_TAGS = [
   "doc",
@@ -18573,7 +18510,7 @@ function handleKey(state, key2, rows) {
 var import_node_path9 = __toESM(require("node:path"), 1);
 
 // src/server/registry.ts
-var import_node_crypto2 = __toESM(require("node:crypto"), 1);
+var import_node_crypto = __toESM(require("node:crypto"), 1);
 var import_node_fs9 = __toESM(require("node:fs"), 1);
 var import_node_os5 = __toESM(require("node:os"), 1);
 var import_node_path8 = __toESM(require("node:path"), 1);
@@ -18582,7 +18519,7 @@ function registryDir(env = process.env, platform = process.platform, uid = proce
   if (platform === "win32") return import_node_path8.default.join(tmpdir, "ryugi", "servers");
   return `/tmp/ryugi-${uid}/servers`;
 }
-var fileFor = (dir, project) => import_node_path8.default.join(dir, `${import_node_crypto2.default.createHash("sha256").update(project).digest("hex").slice(0, 16)}.json`);
+var fileFor = (dir, project) => import_node_path8.default.join(dir, `${import_node_crypto.default.createHash("sha256").update(project).digest("hex").slice(0, 16)}.json`);
 function verifyDir(dir) {
   if (process.platform === "win32") return;
   for (const target of [import_node_path8.default.dirname(dir), dir]) {
@@ -19048,7 +18985,7 @@ ${value.url}`;
 
 // src/cli/start.ts
 var import_node_child_process4 = require("node:child_process");
-var import_node_crypto3 = __toESM(require("node:crypto"), 1);
+var import_node_crypto2 = __toESM(require("node:crypto"), 1);
 var import_node_fs14 = __toESM(require("node:fs"), 1);
 var import_node_path12 = __toESM(require("node:path"), 1);
 var import_node_readline2 = __toESM(require("node:readline"), 1);
@@ -19063,6 +19000,23 @@ var ADDRESS_SOURCE = "(?:[\\w-]{21}|[a-f0-9]{32})";
 var ARTIFACT_LOCATOR_SOURCE = `(?:${SLUG_SOURCE}|${ADDRESS_SOURCE})`;
 var ID_PATTERN = new RegExp(`^${SLUG_SOURCE}$`);
 var ADDRESS_PATTERN = new RegExp(`^${ADDRESS_SOURCE}$`);
+var MINT_ALPHABET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+var MINT_LENGTH = 21;
+var MINTED_PATTERN = new RegExp(`^[a-z0-9]{${MINT_LENGTH}}$`, "i");
+var MINT_BYTE_LIMIT = 248;
+function mintArtifactId() {
+  let id = "";
+  const bytes = new Uint8Array(MINT_LENGTH * 2);
+  while (id.length < MINT_LENGTH) {
+    crypto.getRandomValues(bytes);
+    for (const byte of bytes) {
+      if (byte >= MINT_BYTE_LIMIT) continue;
+      id += MINT_ALPHABET[byte % MINT_ALPHABET.length];
+      if (id.length === MINT_LENGTH) break;
+    }
+  }
+  return id;
+}
 var isArtifactId = (id) => ID_PATTERN.test(id);
 var isArtifactAddress = (id) => ADDRESS_PATTERN.test(id);
 var isArtifactType = (type) => ARTIFACT_TYPES.includes(type);
@@ -19075,10 +19029,6 @@ function artifactKeyOf(relative, isId = isArtifactId) {
 }
 
 // src/server/artifact-address.ts
-var newArtifactId = customAlphabet2(
-  "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-  21
-);
 function artifactId(dir) {
   const file = import_node_path10.default.join(dir, ".artifact-id");
   let id;
@@ -19086,7 +19036,7 @@ function artifactId(dir) {
     id = import_node_fs12.default.readFileSync(file, "utf8").trim();
   } catch (err) {
     if (err.code !== "ENOENT") throw err;
-    id = newArtifactId();
+    id = mintArtifactId();
     try {
       import_node_fs12.default.writeFileSync(file, `${id}
 `, { flag: "wx" });
@@ -19195,7 +19145,8 @@ function withLink(info, artifact, reused) {
   if (artifact && typeof out.url === "string") {
     const url = new URL(out.url);
     const ref = artifactKeyOf(artifact);
-    out.link = `${url.origin}${artifactPath(String(out.root), ref.type, ref.id)}?key=${url.searchParams.get("key")}`;
+    const key2 = url.searchParams.get("key");
+    out.link = `${url.origin}${artifactPath(String(out.root), ref.type, ref.id)}${key2 ? `?key=${key2}` : ""}`;
   }
   return out;
 }
@@ -19361,7 +19312,7 @@ async function start(options, emit) {
     registerOwner(paths);
     recordAgent(paths);
     import_node_fs14.default.rmSync(paths.info, { force: true });
-    const id = import_node_crypto3.default.randomBytes(24).toString("hex");
+    const id = import_node_crypto2.default.randomBytes(24).toString("hex");
     import_node_fs14.default.writeFileSync(paths.serverId, `${id}
 `);
     import_node_fs14.default.writeFileSync(paths.version, `${version}
@@ -19694,7 +19645,7 @@ var updateCommand = {
   },
   run: ({ values }, emit) => update2(
     {
-      current: "1.47.0",
+      current: "1.48.0",
       file: __filename,
       env: process.env,
       registry: process.env.npm_config_registry || "https://registry.npmjs.org/",
@@ -19775,7 +19726,7 @@ async function main(argv) {
   const [name, ...rest] = argv;
   const command = COMMANDS.find((candidate) => candidate.name === name);
   const json = argv.includes("--json") || !command?.explicitJson && !process.stdout.isTTY;
-  notifyUpdate("1.47.0", json, argv);
+  notifyUpdate("1.48.0", json, argv);
   const emit = (value) => {
     const line = json ? JSON.stringify(value) : text(value);
     if (!json && typeof value.error === "string") console.error(line);
@@ -19794,7 +19745,7 @@ async function main(argv) {
       return await command.run(parse(rest, command.options, command.positionals), emit);
     }
     if (name === "--version" || name === "-v") {
-      console.info("1.47.0");
+      console.info("1.48.0");
       return 0;
     }
     if (name === "--help" || name === "-h") {