@koishi-ce/plugin-market 1.0.0 → 1.0.1

package/lib/index.mjs

@@ -1,12 +1,12 @@
 import { createRequire } from "node:module";
-import { resolve } from "node:path";
+import { join, resolve } from "node:path";
 import { Logger, Schema, Service, Time, defineProperty, pick, valueMap } from "@koishi-ce/koishi";
 import { compare, gt, satisfies, valid } from "semver";
 import { DataService } from "@koishi-ce/console";
 import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
 import Scanner from "@koishi-ce/registry";
 import spawn from "execa";
-import getRegistry from "get-registry";
 import pMap from "p-map";
 import messageZhCN from "./assets/message.zh-CN-B_nH77kB.yml";
 import schemaZhCN from "./assets/schema.zh-CN-CLU01Lrj.yml";
@@ -33,6 +33,31 @@ var RegistryProvider = class extends DataService {
 //#endregion
 //#region src/node/installer.ts
 const logger$1 = new Logger("market");
+/** 从单个 .npmrc 文件提取 registry 配置项；文件不存在或读取出错一律视为未配置 */
+function readNpmrcRegistry(file) {
+	try {
+		for (const line of readFileSync(file, "utf8").split(/\r?\n/)) {
+			const value = /^\s*registry\s*=\s*(\S+)\s*$/.exec(line)?.[1];
+			if (value) return value;
+		}
+	} catch {}
+}
+/**
+* 读取本机 npm registry 配置（优先级对齐 npm 自身：环境变量 > 项目
+* .npmrc > 用户 ~/.npmrc）。刻意不 spawn 子进程探测——原依赖
+* get-registry 按 user-agent 选 `bun config get registry`，而 Bun 没有
+* config 子命令，Bun 运行时下子进程退出码 1 直接炸掉 market 服务启动；
+* 读 npmrc 是零子进程的等价路径。任何一步都拿不到时返回 undefined，
+* 由调用方回落默认 endpoint。
+*/
+function getLocalRegistry(cwd, userHome = homedir()) {
+	const candidates = [
+		process.env["npm_config_registry"],
+		readNpmrcRegistry(join(cwd, ".npmrc")),
+		readNpmrcRegistry(join(userHome, ".npmrc"))
+	];
+	for (const candidate of candidates) if (candidate?.startsWith("https://") || candidate?.startsWith("http://")) return candidate;
+}
 const whichPMRuns = createRequire(import.meta.url)("which-pm-runs");
 const levelMap = {
 	info: "info",
@@ -75,7 +100,7 @@ var Installer = class extends Service {
 	}
 	async start() {
 		const { endpoint, timeout } = this.config;
-		this.endpoint = endpoint ?? await getRegistry();
+		this.endpoint = endpoint ?? getLocalRegistry(this.cwd);
 		const options = {};
 		if (this.endpoint) options.endpoint = this.endpoint;
 		if (timeout !== void 0) options.timeout = timeout;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@koishi-ce/plugin-market",
     "description": "Manage your bots and plugins with console",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "type": "module",
     "main": "lib/index.mjs",
     "typings": "lib/index.d.ts",
@@ -71,7 +71,6 @@
         "@koishi-ce/console": "^1.0.0",
         "@koishi-ce/registry": "^1.0.0",
         "execa": "^5.1.1",
-        "get-registry": "^1.2.0",
         "p-map": "^4.0.0",
         "semver": "^7.6.3",
         "which-pm-runs": "^1.1.0"

package/src/node/installer.ts

@@ -1,6 +1,7 @@
 import { readFileSync } from "node:fs";
 import { createRequire } from "node:module";
-import { resolve } from "node:path";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
 import type {} from "@koishi-ce/console";
 import {
 	type Context,
@@ -23,12 +24,48 @@ import Scanner, {
 	type RemotePackage,
 } from "@koishi-ce/registry";
 import spawn from "execa";
-import getRegistry from "get-registry";
 import pMap from "p-map";
 import { compare, satisfies, valid } from "semver";
 
 const logger = new Logger("market");
 
+/** 从单个 .npmrc 文件提取 registry 配置项；文件不存在或读取出错一律视为未配置 */
+function readNpmrcRegistry(file: string): string | undefined {
+	try {
+		for (const line of readFileSync(file, "utf8").split(/\r?\n/)) {
+			const matched = /^\s*registry\s*=\s*(\S+)\s*$/.exec(line);
+			const value = matched?.[1];
+			if (value) return value;
+		}
+	} catch {}
+	return undefined;
+}
+
+/**
+ * 读取本机 npm registry 配置（优先级对齐 npm 自身：环境变量 > 项目
+ * .npmrc > 用户 ~/.npmrc）。刻意不 spawn 子进程探测——原依赖
+ * get-registry 按 user-agent 选 `bun config get registry`，而 Bun 没有
+ * config 子命令，Bun 运行时下子进程退出码 1 直接炸掉 market 服务启动；
+ * 读 npmrc 是零子进程的等价路径。任何一步都拿不到时返回 undefined，
+ * 由调用方回落默认 endpoint。
+ */
+function getLocalRegistry(
+	cwd: string,
+	userHome: string = homedir(),
+): string | undefined {
+	const candidates = [
+		process.env["npm_config_registry"],
+		readNpmrcRegistry(join(cwd, ".npmrc")),
+		readNpmrcRegistry(join(userHome, ".npmrc")),
+	];
+	for (const candidate of candidates) {
+		if (candidate?.startsWith("https://") || candidate?.startsWith("http://")) {
+			return candidate;
+		}
+	}
+	return undefined;
+}
+
 // 经 createRequire 加载 CJS 包并就地断言签名：不走 ESM 导入互操作，
 // 规避多包合并类型检查（大一统 tsconfig）下 export = 交织失效问题
 const whichPMRuns = createRequire(import.meta.url)("which-pm-runs") as () =>
@@ -133,7 +170,7 @@ class Installer extends Service {
 
 	override async start() {
 		const { endpoint, timeout } = this.config;
-		this.endpoint = endpoint ?? (await getRegistry());
+		this.endpoint = endpoint ?? getLocalRegistry(this.cwd);
 		const options: HTTP.Config = {};
 		if (this.endpoint) options.endpoint = this.endpoint;
 		if (timeout !== undefined) options.timeout = timeout;