byr-pt-cli 0.1.0 → 0.1.2

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 onemoreproduct
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,64 +1,85 @@
 # byr-pt-cli
 
-`byr-cli` is a standalone CLI package with OpenClaw-friendly JSON output contracts.
+CLI for `byr.pt` with stable machine-readable output (`--json`) and script-friendly commands for search, details, download, auth, and user stats.
 
-## Commands
+## Install
+
+```bash
+npm i -g byr-pt-cli
+byr --help
+```
+
+## Quick start
 
 ```bash
+# Use cookie (recommended)
 export BYR_COOKIE='uid=...; pass=...'
-# or: export BYR_USERNAME='...' BYR_PASSWORD='...'
 
+# Or username/password
+# export BYR_USERNAME='...'
+# export BYR_PASSWORD='...'
+
+byr search --query "ubuntu" --limit 5
+byr get --id 1001
+byr download --id 1001 --output ./1001.torrent --dry-run
+```
+
+## Commands
+
+```bash
 byr search --query "ubuntu" --limit 5 --category movie --spstate free
 byr search --imdb tt0133093 --json
 byr get --id 1001
-byr download --id 1001 --output ./1001.torrent --dry-run
+byr download --id 1001 --output ./1001.torrent
 byr user info --json
 byr meta categories --json
 byr meta levels --json
 byr auth status --verify --json
+byr auth import-cookie --cookie "uid=...; pass=..." --json
 byr auth import-cookie --from-browser chrome --profile "Default" --json
 byr auth logout --json
 ```
 
-`auth import-cookie` accepts both cookie formats:
+## Search filters
 
-- legacy: `uid=...; pass=...`
-- current BYR session: `session_id=...; auth_token=...` (optional `refresh_token=...`)
+- `--category` repeatable / comma-separated, accepts alias or numeric ID
+- `--incldead` `all|alive|dead` (or `0|1|2`)
+- `--spstate` `all|normal|free|2x|2xfree|50|2x50|30` (or `0..7`)
+- `--bookmarked` `all|only|unbookmarked` (or `0|1|2`)
+- `--imdb` alternative to `--query`
+- `--page` page index
 
-Search flags (new):
+## Auth and config
 
-- `--category` (repeatable and comma-separated, accepts aliases/id)
-- `--incldead` (`all|alive|dead` or `0|1|2`)
-- `--spstate` (`all|normal|free|2x|2xfree|50|2x50|30` or `0..7`)
-- `--bookmarked` (`all|only|unbookmarked` or `0|1|2`)
-- `--imdb` (alternative to `--query`)
-- `--page`
+Credential source priority:
 
-Auth/config priority:
+`CLI flags > ENV > ./.byrrc.json > ~/.config/byr-cli/config.json > ~/.config/byr-cli/auth.json`
 
-- `CLI flags > ENV > ./.byrrc.json > ~/.config/byr-cli/config.json > ~/.config/byr-cli/auth.json`
+`auth import-cookie` supports:
+
+- legacy BYR cookie: `uid=...; pass=...`
+- current session cookie: `session_id=...; auth_token=...` (optional `refresh_token=...`)
 
 ## JSON contract
 
-Every command supports `--json`.
+All commands support `--json`.
 
 - success: `{ "ok": true, "data": ..., "meta": ... }`
 - error: `{ "ok": false, "error": { "code": "...", "message": "...", "details": ... } }`
 
-## Local live smoke
+## Testing
+
+Run package tests and checks:
 
 ```bash
-BYR_LIVE=1 BYR_COOKIE='uid=...; pass=...' pnpm --filter byr-pt-cli test:live
+pnpm --filter byr-pt-cli test
+pnpm --filter byr-pt-cli check
 ```
 
-Live smoke flow: `search -> get -> download --dry-run -> user info`.
-CI should keep `test:live` disabled and only run fixture/mock tests.
-
-## Skill bundle
-
-OpenClaw runtime skill is in `skill-openclaw/` and can be published to ClawHub.
+Local live smoke (requires valid BYR credentials):
 
 ```bash
-# Reads publish settings from skill-openclaw/publish.json
-pnpm --filter byr-pt-cli skill:publish
+BYR_LIVE=1 BYR_COOKIE='uid=...; pass=...' pnpm --filter byr-pt-cli test:live
 ```
+
+Flow: `search -> get -> download --dry-run -> user info`.

package/dist/{cli-CdpxYIyd.mjs → cli-B6Pr98en.mjs}

@@ -2,9 +2,9 @@ import { renderDownloadOutput, runDownloadCommand } from "./commands/download.mj
 import { renderGetOutput, runGetCommand } from "./commands/get.mjs";
 import { renderSearchOutput, runSearchCommand } from "./commands/search.mjs";
 import { a as BYR_INCLDEAD_FACET, c as parseCategoryAliases, i as BYR_BOOKMARKED_FACET, l as parseSimpleFacetAliases, o as BYR_SPSTATE_FACET, s as getByrMetadata, t as createByrClient } from "./client-DT9oDCaE.mjs";
-import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
+import { mkdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { CliAppError, EXIT_CODES, createCommandContext, createErrorEnvelope, createSuccessEnvelope, mapErrorCodeToExitCode, toCliAppError } from "@onemoreproduct/cli-core";
-import { copyFileSync, existsSync, readFileSync, statSync } from "node:fs";
+import { copyFileSync, existsSync, readFileSync, rmSync, statSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { createDecipheriv, pbkdf2Sync, randomUUID } from "node:crypto";
@@ -17,6 +17,13 @@ const TARGET_DOMAINS = new Set([
 	".bt.byr.cn",
 	"bt.byr.cn"
 ]);
+const AUTH_COOKIE_NAMES = new Set([
+	"uid",
+	"pass",
+	"session_id",
+	"auth_token",
+	"refresh_token"
+]);
 async function importCookieFromBrowser(browser, profile) {
 	if (process.platform !== "darwin") throw new CliAppError({
 		code: "E_AUTH_REQUIRED",
@@ -44,43 +51,46 @@ function importCookieFromChrome(profile) {
 	const shm = `${dbPath}-shm`;
 	if (existsSync(wal)) copyFileSync(wal, `${tempDb}-wal`);
 	if (existsSync(shm)) copyFileSync(shm, `${tempDb}-shm`);
-	const sqlite = spawnSync("sqlite3", [
-		"-separator",
-		"	",
-		tempDb,
-		"SELECT name, value, hex(encrypted_value) FROM cookies WHERE host_key IN ('.byr.pt','byr.pt','.bt.byr.cn','bt.byr.cn') AND name IN ('uid','pass')"
-	], { encoding: "utf8" });
-	if (sqlite.status !== 0) throw new CliAppError({
-		code: "E_AUTH_REQUIRED",
-		message: "Failed to read Chrome cookies with sqlite3",
-		details: { stderr: sqlite.stderr?.trim() }
-	});
-	const decrypted = /* @__PURE__ */ new Map();
-	const lines = (sqlite.stdout ?? "").split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
-	let keyHex;
-	for (const line of lines) {
-		const [name, value, encryptedHex] = line.split("	");
-		if (name !== "uid" && name !== "pass") continue;
-		if (value && value.length > 0) {
-			decrypted.set(name, value);
-			continue;
+	try {
+		const sqlite = spawnSync("sqlite3", [
+			"-separator",
+			"	",
+			tempDb,
+			"SELECT name, value, hex(encrypted_value) FROM cookies WHERE host_key IN ('.byr.pt','byr.pt','.bt.byr.cn','bt.byr.cn') AND name IN ('uid','pass','session_id','auth_token','refresh_token')"
+		], { encoding: "utf8" });
+		if (sqlite.status !== 0) throw new CliAppError({
+			code: "E_AUTH_REQUIRED",
+			message: "Failed to read Chrome cookies with sqlite3",
+			details: { stderr: sqlite.stderr?.trim() }
+		});
+		const cookies = /* @__PURE__ */ new Map();
+		const lines = (sqlite.stdout ?? "").split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
+		let keyHex;
+		for (const line of lines) {
+			const [name, value, encryptedHex] = line.split("	");
+			if (!AUTH_COOKIE_NAMES.has(name)) continue;
+			if (value && value.length > 0) {
+				cookies.set(name, value);
+				continue;
+			}
+			if (!keyHex) keyHex = getChromeSafeStorageKeyHex();
+			if (!encryptedHex || encryptedHex.length === 0 || !keyHex) continue;
+			const resolved = decryptChromeCookieHex(encryptedHex, keyHex);
+			if (resolved) cookies.set(name, resolved);
 		}
-		if (!keyHex) keyHex = getChromeSafeStorageKeyHex();
-		if (!encryptedHex || encryptedHex.length === 0 || !keyHex) continue;
-		const resolved = decryptChromeCookieHex(encryptedHex, keyHex);
-		if (resolved) decrypted.set(name, resolved);
+		return {
+			cookie: buildByrAuthCookieHeader(cookies, {
+				source: `chrome:${profileName}`,
+				profile: profileName
+			}),
+			source: `chrome:${profileName}`
+		};
+	} finally {
+		rmSync(tempDir, {
+			recursive: true,
+			force: true
+		});
 	}
-	const uid = decrypted.get("uid");
-	const pass = decrypted.get("pass");
-	if (!uid || !pass) throw new CliAppError({
-		code: "E_AUTH_REQUIRED",
-		message: "Unable to extract uid/pass from Chrome cookies",
-		details: { profile: profileName }
-	});
-	return {
-		cookie: `uid=${uid}; pass=${pass}`,
-		source: `chrome:${profileName}`
-	};
 }
 function getChromeSafeStorageKeyHex() {
 	for (const [service, account] of [["Chrome Safe Storage", "Chrome"], ["Chrome Safe Storage", "Google Chrome"]]) {
@@ -137,7 +147,7 @@ function tryReadSafariSqlite(path) {
 		"-separator",
 		"	",
 		path,
-		"SELECT name, value, host FROM cookies WHERE host IN ('.byr.pt','byr.pt','.bt.byr.cn','bt.byr.cn') AND name IN ('uid','pass')"
+		"SELECT name, value, host FROM cookies WHERE host IN ('.byr.pt','byr.pt','.bt.byr.cn','bt.byr.cn') AND name IN ('uid','pass','session_id','auth_token','refresh_token')"
 	], { encoding: "utf8" });
 	if (sqlite.status !== 0) return;
 	const records = [];
@@ -168,15 +178,37 @@ function extractByrCookie(records, source) {
 	const map = /* @__PURE__ */ new Map();
 	for (const record of records) {
 		if (!TARGET_DOMAINS.has(record.domain)) continue;
-		if (record.name === "uid" || record.name === "pass") map.set(record.name, record.value);
+		if (AUTH_COOKIE_NAMES.has(record.name)) map.set(record.name, record.value);
 	}
-	const uid = map.get("uid");
-	const pass = map.get("pass");
-	if (!uid || !pass) return;
-	return {
-		cookie: `uid=${uid}; pass=${pass}`,
-		source
-	};
+	if (map.size === 0) return;
+	try {
+		return {
+			cookie: buildByrAuthCookieHeader(map, { source }),
+			source
+		};
+	} catch {
+		return;
+	}
+}
+function buildByrAuthCookieHeader(cookieMap, context) {
+	const uid = cookieMap.get("uid");
+	const pass = cookieMap.get("pass");
+	if (uid && pass) return `uid=${uid}; pass=${pass}`;
+	const sessionId = cookieMap.get("session_id");
+	const authToken = cookieMap.get("auth_token");
+	if (sessionId && authToken) {
+		const refreshToken = cookieMap.get("refresh_token");
+		return refreshToken ? `session_id=${sessionId}; auth_token=${authToken}; refresh_token=${refreshToken}` : `session_id=${sessionId}; auth_token=${authToken}`;
+	}
+	throw new CliAppError({
+		code: "E_AUTH_REQUIRED",
+		message: "Unable to extract BYR auth cookies from browser storage",
+		details: {
+			source: context.source,
+			profile: context.profile,
+			requiredAnyOf: [["uid", "pass"], ["session_id", "auth_token"]]
+		}
+	});
 }
 function parseBinaryCookies(buffer) {
 	if (buffer.length < 8 || buffer.subarray(0, 4).toString("ascii") !== "cook") return [];
@@ -290,9 +322,23 @@ async function writeAuthStore(cookie, source) {
 	return store;
 }
 async function clearAuthStore() {
+	const authStorePath = getByrAuthStorePath();
+	let existed = true;
+	try {
+		await stat(authStorePath);
+	} catch (error) {
+		const nodeError = error;
+		if (nodeError.code === "ENOENT") existed = false;
+		else throw new CliAppError({
+			code: "E_AUTH_INVALID",
+			message: "Failed to inspect BYR auth store",
+			details: { reason: nodeError.message },
+			cause: error
+		});
+	}
 	try {
-		await rm(getByrAuthStorePath(), { force: true });
-		return true;
+		await rm(authStorePath, { force: true });
+		return existed;
 	} catch (error) {
 		throw new CliAppError({
 			code: "E_AUTH_INVALID",

package/dist/cli.mjs

@@ -1,4 +1,4 @@
 import "./client-DT9oDCaE.mjs";
-import { t as runCli } from "./cli-CdpxYIyd.mjs";
+import { t as runCli } from "./cli-B6Pr98en.mjs";
 
 export { runCli };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import "./client-DT9oDCaE.mjs";
-import { t as runCli } from "./cli-CdpxYIyd.mjs";
+import { t as runCli } from "./cli-B6Pr98en.mjs";
 
 //#region src/index.ts
 const exitCode = await runCli(process.argv.slice(2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "byr-pt-cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "private": false,
   "description": "BYR CLI with OpenClaw-friendly JSON contract",
   "license": "MIT",
@@ -20,16 +20,16 @@
       "import": "./dist/cli.mjs"
     }
   },
+  "dependencies": {
+    "clawkit-cli-core": "^0.1.0"
+  },
   "scripts": {
     "build": "tsdown src/index.ts src/cli.ts src/domain/client.ts src/domain/types.ts src/commands/download.ts src/commands/get.ts src/commands/search.ts --format esm --dts",
-    "test": "pnpm --filter @onemoreproduct/cli-core build && vitest run",
+    "test": "pnpm --filter clawkit-cli-core build && vitest run",
     "test:live": "tsx ./scripts/test-live.ts",
     "typecheck": "tsc --project tsconfig.json --noEmit",
     "check": "pnpm typecheck && pnpm test",
     "skill:publish": "node ./scripts/skill-publish.mjs",
     "skill:sync": "clawhub sync --root ./skill-openclaw --all"
-  },
-  "dependencies": {
-    "@onemoreproduct/cli-core": "workspace:*"
   }
-}
+}