koishi-plugin-prism-neo 0.0.19 → 0.0.20

package/lib/index.js

@@ -303,6 +303,34 @@ var formatBilling = /* @__PURE__ */ __name((res, currency) => {
   }
   return message.join("\n");
 }, "formatBilling");
+async function executeWithAutoRegister(context, userArg, userId, action, formatter) {
+  try {
+    const res = await action();
+    return await formatter(res);
+  } catch (e) {
+    const code = e?.response?.data?.errcode;
+    if (code === "USER_NOT_FOUND") {
+      let message = "用户不存在，尝试注册\n";
+      message += await handleRegisterCmd(context, userArg);
+      message += "\n";
+      try {
+        const res = await action();
+        message += await formatter(res);
+        return message;
+      } catch (retryError) {
+        const apiMessage = retryError?.response?.data?.message;
+        if (apiMessage) {
+          message += apiMessage;
+        } else {
+          message += "操作失败。";
+        }
+        return message;
+      }
+    }
+    throw e;
+  }
+}
+__name(executeWithAutoRegister, "executeWithAutoRegister");
 async function getTargetUserId(context, user) {
   if (user) {
     if (!await context.ctx.permissions.check(context.config.admin, context.session)) {
@@ -337,13 +365,9 @@ async function handleLogoutCmd(context, user) {
   if (error) return error;
   if (!context.config.logoutConfirmation) {
     const res = await logout(context, targetUserId);
-    const messagePrefix = user ? `✅ 已为用户 ${await getUserName(context.session, targetUserId)} 退场` : "✅ 退场成功";
-    return [
-      messagePrefix,
-      `入场时间: ${formatDateTime(res.session.createdAt)}`,
-      `离场时间: ${formatDateTime(res.session.closedAt)}`,
-      `消费: ${res.session.finalCost} ${context.config.currency}`
-    ].join("\n");
+    let message = user ? `✅ 已为用户 ${await getUserName(context.session, targetUserId)} 退场` : "✅ 退场成功";
+    message += "\n";
+    message += formatBilling(res, context.config.currency);
   }
   const pendingLogout = kv.get(targetUserId);
   const now = Date.now();
@@ -519,53 +543,79 @@ async function handleWalletAdd(context, user, amount) {
   const { error, userId } = await getTargetUserId(context, user);
   if (error) return error;
   if (!amount) return "请输入数量";
-  const res = await walletAdd(context, parseInt(amount), userId);
-  return [
-    `为用户 ${await getUserName(context.session, userId)} 增加${context.config.currency}成功`,
-    `增加前: ${res.originalBalance}`,
-    `增加后: ${res.finalBalance}`
-  ].join("\n");
+  return executeWithAutoRegister(
+    context,
+    user,
+    userId,
+    () => walletAdd(context, parseInt(amount), userId),
+    async (res) => {
+      return [
+        `为用户 ${await getUserName(context.session, userId)} 增加${context.config.currency}成功`,
+        `增加前: ${res.originalBalance}`,
+        `增加后: ${res.finalBalance}`
+      ].join("\n");
+    }
+  );
 }
 __name(handleWalletAdd, "handleWalletAdd");
 async function handleWalletDeduct(context, user, amount) {
   const { error, userId } = await getTargetUserId(context, user);
   if (error) return error;
   if (!amount) return "请输入数量";
-  const res = await walletDel(context, parseInt(amount), userId);
-  return [
-    `为用户 ${userId} 扣除${context.config.currency}成功`,
-    `扣款前: ${res.originalBalance}`,
-    `扣款后: ${res.finalBalance}`
-  ].join("\n");
+  return executeWithAutoRegister(
+    context,
+    user,
+    userId,
+    () => walletDel(context, parseInt(amount), userId),
+    (res) => {
+      return [
+        `为用户 ${userId} 扣除${context.config.currency}成功`,
+        `扣款前: ${res.originalBalance}`,
+        `扣款后: ${res.finalBalance}`
+      ].join("\n");
+    }
+  );
 }
 __name(handleWalletDeduct, "handleWalletDeduct");
 async function handleCostOverwrite(context, user, amount) {
   const { error, userId } = await getTargetUserId(context, user);
   if (error) return error;
   if (!amount) return "请输入数量";
-  await costOverwrite(context, amount, userId);
-  return `为用户 ${userId} 调价成功`;
+  return executeWithAutoRegister(
+    context,
+    user,
+    userId,
+    () => costOverwrite(context, amount, userId),
+    () => `为用户 ${userId} 调价成功`
+  );
 }
 __name(handleCostOverwrite, "handleCostOverwrite");
 async function handleRedeem(context, code) {
   const { error, userId } = await getTargetUserId(context, null);
   if (error) return error;
   if (!code) return "请输入兑换码";
-  const res = await redeem(context, code, userId);
-  const items = res;
-  if (!items || items.length === 0) {
-    return "兑换成功，但没有获得任何物品。";
-  }
-  const message = ["✅ 兑换成功！您获得了以下物品："];
-  items.forEach((item) => {
-    let itemName = item.name;
-    if (item.assetType === "PASS" && item.durationMs) {
-      const days = Math.floor(item.durationMs / (1e3 * 60 * 60 * 24));
-      if (days > 0) itemName += ` (${days}天)`;
+  return executeWithAutoRegister(
+    context,
+    void 0,
+    userId,
+    () => redeem(context, code, userId),
+    (res) => {
+      const items = res;
+      if (!items || items.length === 0) {
+        return "兑换成功，但没有获得任何物品。";
+      }
+      const message = ["✅ 兑换成功！您获得了以下物品："];
+      items.forEach((item) => {
+        let itemName = item.name;
+        if (item.assetType === "PASS" && item.durationMs) {
+          const days = Math.floor(item.durationMs / (1e3 * 60 * 60 * 24));
+          if (days > 0) itemName += ` (${days}天)`;
+        }
+        message.push(`- ${itemName} x${item.count}`);
+      });
+      return message.join("\n");
     }
-    message.push(`- ${itemName} x${item.count}`);
-  });
-  return message.join("\n");
+  );
 }
 __name(handleRedeem, "handleRedeem");
 async function handleCoin(context, alias) {

package/lib/model.d.ts

@@ -119,6 +119,7 @@ export interface BillingResponse {
 }
 export interface ApiErrorData {
     message: string;
+    errcode: string;
 }
 export interface ApiError {
     response: {

package/lib/service.d.ts

@@ -1,8 +1,8 @@
 import { ActionContext } from "./types";
-import { BillingResponse, ListResponse, LogoutResponse, UserAsset, Wallet } from "./model";
+import { BillingResponse, ListResponse, UserAsset, Wallet } from "./model";
 export declare function register({ ctx, config }: ActionContext, userId: string): Promise<unknown>;
 export declare function login({ ctx, config }: ActionContext, userId: string): Promise<unknown>;
-export declare function logout({ ctx, config }: ActionContext, userId: string): Promise<LogoutResponse>;
+export declare function logout({ ctx, config }: ActionContext, userId: string): Promise<BillingResponse>;
 export declare function billing({ ctx, config }: ActionContext, userId: string): Promise<BillingResponse>;
 export declare function list({ ctx, config }: ActionContext): Promise<ListResponse>;
 export declare function wallet({ ctx, config }: ActionContext, userId: string): Promise<Wallet>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-prism-neo",
   "description": "prism koishi前端",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "main": "lib/index.js",
   "files": [
     "lib",