linkshell-cli 0.10.93 → 0.10.94

package/dist/client-core/src/pro-membership.d.ts

@@ -1,18 +1,46 @@
+/**
+ * LinkShell is part of the iTool membership: the monthly tier (iTool site + LinkShell) and the
+ * yearly tier (every iTool product) both include it. Membership is bought on itool.tech only;
+ * clients just read the entitlement and send people to the buy page.
+ */
+export type MembershipTier = "monthly" | "yearly";
 export interface ProMembership {
+    /** "pro": this account may use LinkShell's paid parts (the official gateway) right now. */
     plan: "free" | "pro";
+    /** Which iTool membership grants it; absent when `plan` is "free". */
+    tier?: MembershipTier;
+    /** When LinkShell's entitlement ends; absent when `plan` is "free". */
     expiresAt?: string;
 }
 export interface ProMembershipOptions {
-    supabaseUrl: string;
-    anonKey: string;
     accessToken: string;
-    userId: string;
+    /** Kept for callers that pass it; the entitlement is read for the token's own user. */
+    userId?: string;
+    /** With both, the Supabase RPC is tried when itool.tech can't be reached. */
+    supabaseUrl?: string;
+    anonKey?: string;
+    /** "supabase" skips itool.tech; "itool" (the default) prefers it. */
+    prefer?: "itool" | "supabase";
     signal?: AbortSignal;
 }
-export declare const PRO_CODE_SHOP_URL = "https://pay.ldxp.cn/item/7lgv1s";
-/** The profile is read with the user's token; only the server can grant Pro. */
+export declare const LINKSHELL_PRODUCT = "linkshell";
+/** The only place a membership is bought. Phones must not link to it (App Store rules). */
+export declare const ITOOL_MEMBERSHIP_URL = "https://itool.tech/pro?from=linkshell";
+export declare const ITOOL_ENTITLEMENT_URL = "https://itool.tech/api/membership/entitlement?product=linkshell";
+/**
+ * Why a lookup failed. `login` means the token is no good; `unavailable` and `network` say
+ * nothing about the account, so callers keep what they last knew.
+ */
+export declare class MembershipError extends Error {
+    readonly kind: "login" | "unavailable" | "network" | "malformed";
+    constructor(message: string, kind: "login" | "unavailable" | "network" | "malformed");
+}
+export declare function membershipTierLabel(tier: MembershipTier | undefined): string;
+/**
+ * The result of `itool_entitlement('linkshell')`, through either route, as LinkShell shows it.
+ * `active` is the server's answer; an expiry already past the server's clock still reads as
+ * free so a stale row can't grant anything.
+ */
+export declare function membershipFromEntitlement(value: unknown): ProMembership;
+/** The entitlement is read with the user's own token; only the server can grant it. */
 export declare function fetchProMembership(options: ProMembershipOptions): Promise<ProMembership>;
-export declare function redeemProCode(accessToken: string, code: string): Promise<{
-    expiresAt: string;
-    idempotent: boolean;
-}>;

package/dist/client-core/src/pro-membership.js

@@ -1,13 +1,66 @@
-export const PRO_CODE_SHOP_URL = "https://pay.ldxp.cn/item/7lgv1s";
-const REDEEM_URL = "https://itool.tech/api/pro/redeem";
+/**
+ * LinkShell is part of the iTool membership: the monthly tier (iTool site + LinkShell) and the
+ * yearly tier (every iTool product) both include it. Membership is bought on itool.tech only;
+ * clients just read the entitlement and send people to the buy page.
+ */
+export const LINKSHELL_PRODUCT = "linkshell";
+/** The only place a membership is bought. Phones must not link to it (App Store rules). */
+export const ITOOL_MEMBERSHIP_URL = "https://itool.tech/pro?from=linkshell";
+export const ITOOL_ENTITLEMENT_URL = `https://itool.tech/api/membership/entitlement?product=${LINKSHELL_PRODUCT}`;
 const REQUEST_TIMEOUT_MS = 15_000;
 const LOGIN_REQUIRED = "登录已失效，请重新登录后再试";
+const MALFORMED = "会员状态返回异常，请稍后重试";
+/**
+ * Why a lookup failed. `login` means the token is no good; `unavailable` and `network` say
+ * nothing about the account, so callers keep what they last knew.
+ */
+export class MembershipError extends Error {
+    kind;
+    constructor(message, kind) {
+        super(message);
+        this.kind = kind;
+        this.name = "MembershipError";
+    }
+}
+export function membershipTierLabel(tier) {
+    return tier === "yearly" ? "iTool 年度会员" : tier === "monthly" ? "iTool 月度会员" : "iTool 会员";
+}
 function record(value) {
     return value !== null && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function timestamp(value) {
     return typeof value === "string" ? Date.parse(value) : NaN;
 }
+/**
+ * The result of `itool_entitlement('linkshell')`, through either route, as LinkShell shows it.
+ * `active` is the server's answer; an expiry already past the server's clock still reads as
+ * free so a stale row can't grant anything.
+ */
+export function membershipFromEntitlement(value) {
+    const body = record(value);
+    if (!body)
+        throw new MembershipError(MALFORMED, "malformed");
+    if (body.ok !== true) {
+        if (body.code === "login_required")
+            throw new MembershipError(LOGIN_REQUIRED, "login");
+        throw new MembershipError(MALFORMED, "malformed");
+    }
+    if (body.product !== undefined && body.product !== LINKSHELL_PRODUCT)
+        throw new MembershipError(MALFORMED, "malformed");
+    if (typeof body.active !== "boolean")
+        throw new MembershipError(MALFORMED, "malformed");
+    if (!body.active)
+        return { plan: "free" };
+    const until = timestamp(body.valid_until);
+    if (!Number.isFinite(until))
+        throw new MembershipError(MALFORMED, "malformed");
+    const serverTime = timestamp(body.server_time);
+    if (until <= (Number.isFinite(serverTime) ? serverTime : Date.now()))
+        return { plan: "free" };
+    // An active entitlement always comes from a paid tier; monthly is the least it can be.
+    const tier = body.tier === "yearly" ? "yearly" : "monthly";
+    return { plan: "pro", tier, expiresAt: body.valid_until };
+}
 async function request(url, init) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
@@ -25,85 +78,60 @@ async function request(url, init) {
         return { response, body };
     }
     catch {
-        throw new Error(controller.signal.aborted ? "请求超时，请稍后重试" : "网络连接失败，请检查网络后重试");
+        throw new MembershipError(controller.signal.aborted ? "请求超时，请稍后重试" : "网络连接失败，请检查网络后重试", "network");
     }
     finally {
         clearTimeout(timer);
     }
 }
-/** The profile is read with the user's token; only the server can grant Pro. */
-export async function fetchProMembership(options) {
-    if (!options.accessToken.trim() || !options.userId.trim())
-        throw new Error(LOGIN_REQUIRED);
-    const url = `${options.supabaseUrl.replace(/\/$/, "")}/rest/v1/profiles?select=plan,plan_expires_at&id=eq.${encodeURIComponent(options.userId)}&limit=1`;
-    const { response, body } = await request(url, {
-        headers: { apikey: options.anonKey, Authorization: `Bearer ${options.accessToken}` },
-        signal: options.signal,
-    });
+function checkStatus(response) {
     if (response.status === 401 || response.status === 403)
-        throw new Error(LOGIN_REQUIRED);
+        throw new MembershipError(LOGIN_REQUIRED, "login");
+    if (response.status === 502 || response.status === 503)
+        throw new MembershipError("会员服务暂时不可用，请稍后重试", "unavailable");
     if (!response.ok)
-        throw new Error("暂时无法获取会员状态，请稍后重试");
-    if (!Array.isArray(body))
-        throw new Error("会员状态返回异常，请稍后重试");
-    if (body.length === 0)
-        return { plan: "free" };
-    const profile = record(body[0]);
-    if (!profile || typeof profile.plan !== "string")
-        throw new Error("会员状态返回异常，请稍后重试");
-    const expiresAt = profile.plan_expires_at;
-    const expires = timestamp(expiresAt);
-    const serverTime = timestamp(response.headers.get("date"));
-    const now = Number.isFinite(serverTime) ? serverTime : Date.now();
-    return profile.plan === "pro" && Number.isFinite(expires) && expires > now
-        ? { plan: "pro", expiresAt: expiresAt }
-        : { plan: "free" };
+        throw new MembershipError("暂时无法获取会员状态，请稍后重试", "unavailable");
 }
-const redeemErrors = {
-    malformed_request: "激活码格式不正确，请检查后重试",
-    login_required: LOGIN_REQUIRED,
-    request_too_large: "激活码内容过长，请检查后重试",
-    invalid_or_unavailable: "激活码无效或已不可用，请检查后重试",
-    rate_limited: "操作太频繁，请稍后重试",
-    temporarily_unavailable: "兑换服务暂时不可用，请稍后重试",
-};
-const redeemStatusCodes = {
-    400: "malformed_request",
-    401: "login_required",
-    413: "request_too_large",
-    422: "invalid_or_unavailable",
-    429: "rate_limited",
-    503: "temporarily_unavailable",
-};
-export async function redeemProCode(accessToken, code) {
-    if (!accessToken.trim())
-        throw new Error(LOGIN_REQUIRED);
-    const normalizedCode = code.trim();
-    if (!normalizedCode)
-        throw new Error("请输入激活码");
-    const { response, body: responseBody } = await request(REDEEM_URL, {
+/** itool.tech's route: reachable from networks where supabase.co is not. */
+async function viaItool(options) {
+    const { response, body } = await request(ITOOL_ENTITLEMENT_URL, {
+        headers: { Authorization: `Bearer ${options.accessToken}` },
+        signal: options.signal,
+    });
+    checkStatus(response);
+    return membershipFromEntitlement(body);
+}
+async function viaSupabase(options) {
+    const { response, body } = await request(`${options.supabaseUrl.replace(/\/$/, "")}/rest/v1/rpc/itool_entitlement`, {
         method: "POST",
-        headers: { Authorization: `Bearer ${accessToken}`, "Content-Type": "application/json" },
-        body: JSON.stringify({ code: normalizedCode }),
+        headers: { apikey: options.anonKey, Authorization: `Bearer ${options.accessToken}`, "Content-Type": "application/json" },
+        body: JSON.stringify({ p_product: LINKSHELL_PRODUCT }),
+        signal: options.signal,
     });
-    const body = record(responseBody);
-    if (!response.ok) {
-        const code = body?.code ?? record(body?.error)?.code;
-        const knownCode = typeof code === "string" && Object.hasOwn(redeemErrors, code) ? code : redeemStatusCodes[response.status];
-        throw new Error(knownCode ? redeemErrors[knownCode] : "兑换失败，请稍后重试");
-    }
-    const expires = timestamp(body?.plan_expires_at);
-    const serverTime = timestamp(body?.server_time);
-    if (body?.ok !== true || body.valid !== true || typeof body.idempotent !== "boolean" ||
-        typeof body.months !== "number" || !Number.isFinite(body.months) || body.months < 0 ||
-        !Number.isFinite(expires) || !Number.isFinite(serverTime)) {
-        throw new Error("兑换结果尚未确认，请刷新会员状态后重试");
+    checkStatus(response);
+    return membershipFromEntitlement(body);
+}
+/** The entitlement is read with the user's own token; only the server can grant it. */
+export async function fetchProMembership(options) {
+    if (!options.accessToken.trim())
+        throw new MembershipError(LOGIN_REQUIRED, "login");
+    const supabase = options.supabaseUrl && options.anonKey ? { ...options, supabaseUrl: options.supabaseUrl, anonKey: options.anonKey } : undefined;
+    const [first, second] = options.prefer === "supabase" && supabase
+        ? [() => viaSupabase(supabase), () => viaItool(options)]
+        : [() => viaItool(options), supabase ? () => viaSupabase(supabase) : undefined];
+    try {
+        return await first();
     }
-    if (expires <= serverTime) {
-        throw new Error(body.idempotent
-            ? "此激活码已兑换且权益已到期，请使用新的激活码"
-            : "兑换结果尚未确认，请刷新会员状态后重试");
+    catch (error) {
+        // Only an unreachable route earns a second try: a refused token or a real answer stands.
+        if (!second || options.signal?.aborted || !(error instanceof MembershipError) || (error.kind !== "network" && error.kind !== "unavailable"))
+            throw error;
+        try {
+            return await second();
+        }
+        catch {
+            throw error;
+        }
     }
-    return { expiresAt: body.plan_expires_at, idempotent: body.idempotent };
 }
 //# sourceMappingURL=pro-membership.js.map

package/dist/client-core/src/pro-membership.js.map

@@ -1 +1 @@
-{"version":3,"file":"pro-membership.js","sourceRoot":"","sources":["../../../../client-core/src/pro-membership.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,iBAAiB,GAAG,iCAAiC,CAAC;AAEnE,MAAM,UAAU,GAAG,mCAAmC,CAAC;AACvD,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAExC,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAgC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7H,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAC7D,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,GAAW,EAAE,IAAiB;IACnD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,kBAAkB,CAAC,CAAC;IACvE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;QACnG,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC5E,IAAI,IAAa,CAAC;QAClB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,YAAY,WAAW,CAAC;gBAAE,MAAM,KAAK,CAAC;QAChF,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;IAChF,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC;AACH,CAAC;AAED,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAA6B;IACpE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAC3F,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,uDAAuD,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;IACzJ,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE;QAC5C,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,UAAU,OAAO,CAAC,WAAW,EAAE,EAAE;QACpF,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IACxF,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAC5D,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC/C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACpF,MAAM,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC;IAC1C,MAAM,OAAO,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;IAClE,OAAO,OAAO,CAAC,IAAI,KAAK,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,GAAG;QACxE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,SAAmB,EAAE;QACjD,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;AACvB,CAAC;AAED,MAAM,YAAY,GAA2B;IAC3C,iBAAiB,EAAE,iBAAiB;IACpC,cAAc,EAAE,cAAc;IAC9B,iBAAiB,EAAE,gBAAgB;IACnC,sBAAsB,EAAE,mBAAmB;IAC3C,YAAY,EAAE,aAAa;IAC3B,uBAAuB,EAAE,iBAAiB;CAC3C,CAAC;AAEF,MAAM,iBAAiB,GAA2B;IAChD,GAAG,EAAE,mBAAmB;IACxB,GAAG,EAAE,gBAAgB;IACrB,GAAG,EAAE,mBAAmB;IACxB,GAAG,EAAE,wBAAwB;IAC7B,GAAG,EAAE,cAAc;IACnB,GAAG,EAAE,yBAAyB;CAC/B,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,WAAmB,EAAE,IAAY;IACnE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IACzD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE;QACjE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,WAAW,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QACvF,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;KAC/C,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,GAAG,IAAI,EAAE,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC;QACrD,MAAM,SAAS,GAAG,OAAO,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC5H,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACjD,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAChD,IACE,IAAI,EAAE,EAAE,KAAK,IAAI,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,SAAS;QAChF,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;QACnF,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EACzD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU;YAC7B,CAAC,CAAC,wBAAwB;YAC1B,CAAC,CAAC,qBAAqB,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,eAAyB,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;AACpF,CAAC"}
+{"version":3,"file":"pro-membership.js","sourceRoot":"","sources":["../../../../client-core/src/pro-membership.ts"],"names":[],"mappings":"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"}

package/dist/gateway/src/subscription.d.ts

@@ -1,10 +1,13 @@
 import type { GatewayOptions } from "./relay.js";
+export declare const MEMBERSHIP_URL = "https://itool.tech/pro?from=linkshell";
 export interface SubscriptionCheck {
     /** "unknown": the lookup itself failed, which says nothing about the account. */
     status: "active" | "inactive" | "unknown";
     reason?: string;
 }
 export type CheckSubscription = (userId: string) => Promise<SubscriptionCheck>;
+/** The RPC's jsonb answer, as the gateway reads it. */
+export declare function subscriptionFromEntitlement(value: unknown): SubscriptionCheck;
 export declare function supabaseSubscriptions(supabase: {
     url: string;
     anonKey: string;
@@ -12,7 +15,7 @@ export declare function supabaseSubscriptions(supabase: {
 }): CheckSubscription;
 /**
  * The official gateway's rule for who may connect: a computer needs an active
- * Pro account. Devices only reach computers they're paired with or share an
+ * iTool membership. Devices only reach computers they're paired with or share an
  * account with, so they need nothing more.
  */
 export declare function requirePro(check: CheckSubscription, warn: (message: string) => void): NonNullable<GatewayOptions["admit"]>;

package/dist/gateway/src/subscription.js

@@ -1,3 +1,18 @@
+// The official gateway is part of the iTool membership: any active member (monthly or yearly)
+// has LinkShell. The gateway asks iTool's `itool_entitlement_for(uid, 'linkshell')` with the
+// service-role key, on its own behalf, not with the user's token.
+export const MEMBERSHIP_URL = "https://itool.tech/pro?from=linkshell";
+/** The RPC's jsonb answer, as the gateway reads it. */
+export function subscriptionFromEntitlement(value) {
+    const body = value !== null && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+    if (!body)
+        return { status: "unknown", reason: "entitlement_malformed" };
+    if (body.ok !== true)
+        return { status: "unknown", reason: `entitlement_${typeof body.code === "string" ? body.code : "refused"}` };
+    if (typeof body.active !== "boolean")
+        return { status: "unknown", reason: "entitlement_malformed" };
+    return { status: body.active ? "active" : "inactive" };
+}
 export function supabaseSubscriptions(supabase) {
     return async (userId) => {
         if (!supabase.url || !supabase.anonKey)
@@ -5,27 +20,24 @@ export function supabaseSubscriptions(supabase) {
         if (!supabase.serviceRoleKey)
             return { status: "unknown", reason: "missing_service_role_key" };
         try {
-            const response = await fetch(`${supabase.url}/rest/v1/profiles?id=eq.${userId}&select=plan,plan_expires_at&limit=1`, {
-                headers: { Authorization: `Bearer ${supabase.serviceRoleKey}`, apikey: supabase.anonKey },
+            const response = await fetch(`${supabase.url.replace(/\/$/, "")}/rest/v1/rpc/itool_entitlement_for`, {
+                method: "POST",
+                headers: { Authorization: `Bearer ${supabase.serviceRoleKey}`, apikey: supabase.anonKey, "Content-Type": "application/json" },
+                body: JSON.stringify({ p_user: userId, p_product: "linkshell" }),
                 signal: AbortSignal.timeout(5_000),
             });
             if (!response.ok)
-                return { status: "unknown", reason: `profile_lookup_http_${response.status}` };
-            const profiles = (await response.json());
-            const profile = profiles[0];
-            if (!profile)
-                return { status: "unknown", reason: "profile_not_found" };
-            const active = profile.plan === "pro" && !!profile.plan_expires_at && new Date(profile.plan_expires_at) > new Date();
-            return { status: active ? "active" : "inactive" };
+                return { status: "unknown", reason: `entitlement_lookup_http_${response.status}` };
+            return subscriptionFromEntitlement(await response.json());
         }
         catch {
-            return { status: "unknown", reason: "profile_lookup_failed" };
+            return { status: "unknown", reason: "entitlement_lookup_failed" };
         }
     };
 }
 /**
  * The official gateway's rule for who may connect: a computer needs an active
- * Pro account. Devices only reach computers they're paired with or share an
+ * iTool membership. Devices only reach computers they're paired with or share an
  * account with, so they need nothing more.
  */
 export function requirePro(check, warn) {
@@ -33,11 +45,11 @@ export function requirePro(check, warn) {
         if (role !== "machine")
             return undefined;
         if (!userId)
-            return "官方网关需要登录 Pro 账号：在电脑上运行 linkshell login";
+            return "官方网关需要登录 iTool 会员账号：在电脑上运行 linkshell login";
         const subscription = await check(userId);
         // A lookup failure isn't a lapsed subscription; don't lock people out over it.
         if (subscription.status === "inactive")
-            return "官方网关需要 Pro 订阅：https://liutianjie.github.io/LinkShell/pricing/";
+            return `官方网关需要 iTool 会员：${MEMBERSHIP_URL}`;
         if (subscription.status === "unknown")
             warn(`subscription check unavailable (${subscription.reason}); admitting ${userId}`);
         return undefined;

package/dist/gateway/src/subscription.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscription.js","sourceRoot":"","sources":["../../../../gateway/src/subscription.ts"],"names":[],"mappings":"AAcA,MAAM,UAAU,qBAAqB,CAAC,QAAkE;IACtG,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE;QACtB,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO;YAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC;QACxG,IAAI,CAAC,QAAQ,CAAC,cAAc;YAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC;QAC/F,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,QAAQ,CAAC,GAAG,2BAA2B,MAAM,sCAAsC,EAAE;gBACnH,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,QAAQ,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE;gBACzF,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC;aACnC,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,EAAE;gBAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YACjG,MAAM,QAAQ,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAuD,CAAC;YAC/F,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC5B,IAAI,CAAC,OAAO;gBAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC;YACxE,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,eAAe,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;YACrH,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;QACpD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC;QAChE,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,KAAwB,EAAE,IAA+B;IAClF,OAAO,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE;QAChC,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACzC,IAAI,CAAC,MAAM;YAAE,OAAO,wCAAwC,CAAC;QAC7D,MAAM,YAAY,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,CAAC;QACzC,+EAA+E;QAC/E,IAAI,YAAY,CAAC,MAAM,KAAK,UAAU;YAAE,OAAO,+DAA+D,CAAC;QAC/G,IAAI,YAAY,CAAC,MAAM,KAAK,SAAS;YAAE,IAAI,CAAC,mCAAmC,YAAY,CAAC,MAAM,gBAAgB,MAAM,EAAE,CAAC,CAAC;QAC5H,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"subscription.js","sourceRoot":"","sources":["../../../../gateway/src/subscription.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkshell-cli",
-  "version": "0.10.93",
+  "version": "0.10.94",
   "description": "Follow, steer and approve the coding agents on your computer (Claude Code, Codex, Gemini, Copilot and more) from your phone",
   "type": "module",
   "main": "dist/cli/src/index.js",
@@ -34,9 +34,9 @@
     "node-pty": "^1.1.0",
     "qrcode-terminal": "^0.12.0",
     "ws": "^8.21.0",
-    "@linkshell/gateway": "0.6.57",
+    "@linkshell/host": "0.4.88",
     "@linkshell/wire": "0.2.28",
-    "@linkshell/host": "0.4.87"
+    "@linkshell/gateway": "0.6.58"
   },
   "devDependencies": {
     "@types/ws": "^8.5.14",

package/src/commands/desktop.ts

@@ -12,7 +12,7 @@ import { prepareDesktopUpdate, recoverDesktopUpdate, stopDesktopUpdateHost } fro
 import { sep, join } from "node:path";
 import { ensureHostRunning, silenceSqliteWarning, withRunningHost } from "./host.js";
 import { linkshellDir, readHostLaunch, readHostOwner, readPid, stopDaemonAndWait } from "../utils/daemon.js";
-import { cachedMembership, redeemDesktopPro, refreshMembership } from "../pro-membership.js";
+import { cachedMembership, refreshMembership } from "../pro-membership.js";
 import { accessPasswordEnabled, applyAccessPassword } from "./password.js";
 
 export function installationSource(path: string): "homebrew" | "npm" {
@@ -104,52 +104,14 @@ async function credentialsInput(input: AsyncIterable<string | Buffer>): Promise<
   throw new Error("请输入邮箱和密码。");
 }
 
-async function redemptionInput(input: AsyncIterable<string | Buffer>): Promise<{ code: string; userId: string }> {
-  const chunks: Buffer[] = [];
-  let length = 0;
-  for await (const chunk of input) {
-    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
-    length += buffer.length;
-    if (length > 4096) throw new Error("激活码内容过长，请检查后重试");
-    chunks.push(buffer);
-  }
-  try {
-    const value = JSON.parse(Buffer.concat(chunks).toString("utf8"));
-    if (typeof value?.code === "string" && typeof value?.userId === "string" && value.userId.trim()) return { code: value.code, userId: value.userId };
-  } catch { /* Never echo an input that contains the activation code. */ }
-  throw new Error("激活码请求无效，请刷新账号后重试");
-}
-
 export async function runDesktop(version: string, action: string, input: AsyncIterable<string | Buffer> = process.stdin, options: { provider?: string } = {}): Promise<void> {
   silenceSqliteWarning();
   try {
-    if (action === "redeem-pro") {
-      const { code, userId } = await redemptionInput(input);
-      const result = await redeemDesktopPro(code, userId);
-      if (loadAuth()?.userId === userId) {
-        try {
-          const gateway = await refreshGateway(15_000);
-          if (gateway && gateway.status !== "online" && gateway.status !== "off") result.accountWarning ??= "兑换已成功，网关尚未连接，请稍后重新连接";
-        } catch {
-          result.accountWarning ??= "兑换已成功，本机服务暂未刷新，请稍后重新连接网关";
-        }
-      }
-      // A host query failing cannot turn a confirmed redemption into a failed redemption.
-      const snapshot = await desktopSnapshot(version).catch(() => {
-        result.accountWarning ??= "兑换已成功，本机服务状态暂时无法读取，请稍后刷新";
-        return { schema: 1, cliVersion: version, status: "unknown", account: desktopAccount() };
-      });
-      snapshot.account = desktopAccount();
-      if (snapshot.account.state === "signed-in" && "userId" in snapshot.account && snapshot.account.userId === userId) Object.assign(snapshot.account, { plan: "pro", planExpiresAt: result.redemption.planExpiresAt });
-      else result.accountWarning = "兑换已成功，登录账号已变更，请切回兑换时的账号查看会员状态";
-      process.stdout.write(`${JSON.stringify({ ...snapshot, ...result })}\n`);
-      return;
-    }
     if (action === "account-refresh") await followAccountGateway((await refreshMembership()).plan);
     else if (action === "pair" || action === "pair-qr") {
       const result = await withRunningHost(async client => {
         const gateway = await client.call("gateway.status", {});
-        if (gateway.status !== "online") throw new Error("请先连接网关。官方网关需要登录 Pro 账号；自建网关可以免登录配对。");
+        if (gateway.status !== "online") throw new Error("请先连接网关。官方网关需要登录 iTool 会员账号；自建网关可以免登录配对。");
         return client.call("pairing.start", {}, 20_000);
       });
       if (!result) throw new Error("请先启动本机服务");

package/src/commands/host.ts

@@ -23,7 +23,7 @@ interface HostConfig {
   setup?: "done";
 }
 
-/** LinkShell's own gateway: a Pro account's computers are reachable there. */
+/** LinkShell's own gateway: an iTool member's computers are reachable there. */
 export const OFFICIAL_GATEWAY = "wss://gateway.itool.tech";
 
 /** Whether two gateway addresses name the same one, however they were typed (scheme, trailing slash). */
@@ -208,7 +208,7 @@ export function describeGateway(gateway: GatewayStatus): string {
 
 /** After `linkshell login`: this computer joins the gateway its account is for. */
 /**
- * A signed-in Pro account's computer belongs on the official gateway: nobody should have to find
+ * A signed-in member's computer belongs on the official gateway: nobody should have to find
  * a button for it before their phone can see this computer. A gateway of one's own (a URL) is kept;
  * "off" is not. A stopped host is left stopped. True when the host was asked to reconnect.
  */
@@ -244,7 +244,7 @@ export async function joinGatewayAfterLogin(plan: "pro" | "free"): Promise<void>
   if (!chosen && plan !== "pro") {
     // A running host now gets the gateway's own answer, instead of an old login's.
     await refreshGateway(0);
-    out("The official gateway needs a Pro subscription: https://liutianjie.github.io/LinkShell/pricing/");
+    out("The official gateway needs an iTool membership (monthly or yearly): https://itool.tech/pro?from=linkshell");
     out("Or use your own gateway: linkshell host --gateway <url>, then linkshell pair\n");
     return;
   }

package/src/commands/login.ts

@@ -161,7 +161,7 @@ export async function runLogin(options: { signal?: AbortSignal } = {}): Promise<
         res.writeHead(200);
         res.end("ok");
 
-        const planLabel = result.plan === "pro" ? "\x1b[32mPro\x1b[0m" : "Free";
+        const planLabel = result.plan === "pro" ? `\x1b[32m${result.tier === "yearly" ? "iTool yearly member" : "iTool monthly member"}\x1b[0m` : "Free";
         process.stderr.write(
           `  \x1b[32m✓\x1b[0m Logged in as ${result.email || result.userId} (${planLabel})\n\n`,
         );

package/src/commands/setup.ts

@@ -66,7 +66,7 @@ async function setUpPhone(out: (line?: string) => void, interactive: boolean): P
     out("  Not connected to a phone yet: linkshell login (LinkShell account), or your own gateway and linkshell pair.");
     return false;
   }
-  out("  Your phone reaches this computer through your LinkShell account (Pro), from anywhere.");
+  out("  Your phone reaches this computer through your LinkShell account (iTool membership), from anywhere.");
   const answer = await ask("  Sign in now? It opens your browser. [Y/n] ");
   if (answer === "n" || answer === "no") {
     out(dim("    Later: linkshell login — or with your own gateway: linkshell host --gateway <url>, then linkshell pair"));

package/src/commands/sign-in.ts

@@ -2,8 +2,7 @@ import * as http from "node:http";
 import { createHash, randomBytes } from "node:crypto";
 import { execFile } from "node:child_process";
 import { saveAuth, SUPABASE_ANON_KEY, SUPABASE_URL, type AuthTokens } from "../auth.js";
-import { cacheMembership, type DesktopMembership } from "../pro-membership.js";
-import { fetchProMembership } from "../../../client-core/src/pro-membership.js";
+import { cacheMembership, lookupMembership, type DesktopMembership } from "../pro-membership.js";
 import { isDefinitiveAccountError, oauthErrorCode, tokenErrorCode } from "../../../client-core/src/account-errors.js";
 import { LoginError } from "./login-error.js";
 
@@ -17,6 +16,8 @@ import { LoginError } from "./login-error.js";
 export interface LoginResult {
   success: boolean;
   plan: "pro" | "free";
+  /** The iTool membership tier when `plan` is "pro". */
+  tier?: "monthly" | "yearly";
   email: string;
   userId: string;
   accessToken: string;
@@ -81,10 +82,9 @@ async function fetchUser(accessToken: string, signal?: AbortSignal): Promise<{ i
 export async function completeLogin(grant: SessionGrant, options: { signal?: AbortSignal } = {}): Promise<LoginResult> {
   if (options.signal?.aborted) throw new LoginError("cancelled");
   const user = grant.user ?? await fetchUser(grant.accessToken, options.signal);
-  let membership: DesktopMembership = { plan: "unknown", planExpiresAt: null };
+  let membership: DesktopMembership = { plan: "unknown", planExpiresAt: null, tier: null };
   try {
-    const profile = await fetchProMembership({ userId: user.id, accessToken: grant.accessToken, supabaseUrl: SUPABASE_URL, anonKey: SUPABASE_ANON_KEY, signal: options.signal });
-    membership = { plan: profile.plan, planExpiresAt: profile.expiresAt ?? null };
+    membership = await lookupMembership(grant.accessToken, options.signal);
   } catch { /* Unknown until the next refresh. */ }
   // The owner gave up while this was in flight: an existing login must stay as it was.
   if (options.signal?.aborted) throw new LoginError("cancelled");
@@ -98,7 +98,7 @@ export async function completeLogin(grant: SessionGrant, options: { signal?: Abo
   };
   saveAuth(tokens);
   try { cacheMembership(user.id, membership); } catch { /* A cache write cannot invalidate a completed login. */ }
-  return { success: true, plan: membership.plan === "pro" ? "pro" : "free", email, userId: user.id, accessToken: grant.accessToken };
+  return { success: true, plan: membership.plan === "pro" ? "pro" : "free", ...(membership.plan === "pro" && membership.tier ? { tier: membership.tier } : {}), email, userId: user.id, accessToken: grant.accessToken };
 }
 
 function parseGrant(body: unknown): SessionGrant | undefined {