intonear-erp-cli 0.2.1 → 0.2.2

package/dist/bin.js

@@ -15888,6 +15888,15 @@ var CLIENT_ID = "erp-cli";
 var SCOPE = "openid erp:read erp:write offline_access";
 var DEFAULT_LOOPBACK_PORT = 53682;
 var CALLBACK_TIMEOUT_MS = 18e4;
+var ErpAuthorizationError = class extends Error {
+  constructor(oauthError, oauthMessage) {
+    super(oauthMessage ?? oauthError);
+    this.oauthError = oauthError;
+    this.oauthMessage = oauthMessage;
+    this.name = "ErpAuthorizationError";
+  }
+  code = "ERP_AUTHORIZATION_FAILED";
+};
 function base64Url(value) {
   return Buffer.from(value).toString("base64url");
 }
@@ -16006,9 +16015,16 @@ async function loginWithBrowser(dependencies) {
     throw error51;
   }
   const callback = await callbackPromise;
+  if (callback.searchParams.get("state") !== state) throw new Error("ERP_AUTH_INVALID_CALLBACK");
+  const oauthError = callback.searchParams.get("error");
+  if (oauthError) {
+    throw new ErpAuthorizationError(
+      oauthError,
+      callback.searchParams.get("error_description") ?? void 0
+    );
+  }
   const code = callback.searchParams.get("code");
-  if (!code || callback.searchParams.get("state") !== state)
-    throw new Error("ERP_AUTH_INVALID_CALLBACK");
+  if (!code) throw new Error("ERP_AUTH_INVALID_CALLBACK");
   const response = await dependencies.fetch(`${origin}/auth/token`, {
     method: "POST",
     headers: { accept: "application/json", "content-type": "application/x-www-form-urlencoded" },
@@ -16378,16 +16394,23 @@ async function runCli(args2, dependencies) {
         return 0;
       }
     } catch (error51) {
-      dependencies.stderr(
-        `${JSON.stringify({ error: error51 instanceof Error ? error51.message : "AUTH_FAILED" })}
-`
-      );
+      const payload = error51 instanceof ErpAuthorizationError ? {
+        error: error51.code,
+        oauthError: error51.oauthError,
+        ...error51.oauthMessage ? { message: error51.oauthMessage } : {}
+      } : { error: error51 instanceof Error ? error51.message : "AUTH_FAILED" };
+      dependencies.stderr(`${JSON.stringify(payload)}
+`);
       return 1;
     }
     dependencies.stderr(`${JSON.stringify({ error: "UNKNOWN_AUTH_COMMAND" })}
 `);
     return 1;
   }
+  if (args2.length === 2 && args2[0] === "call" && args2[1] === "--help") {
+    dependencies.stdout(callHelp());
+    return 0;
+  }
   if (args2[0] === "list") {
     const operations2 = Object.values(dependencies.operations).filter(isCallableAgentOperation).sort((left, right) => left.operationId.localeCompare(right.operationId)).map(
       ({
@@ -16443,6 +16466,13 @@ async function runCli(args2, dependencies) {
 `);
     return 0;
   }
+  if (args2.length === 2 && args2[1] === "--help") {
+    const help2 = commandGroupHelp(args2[0] ?? "", dependencies.operations);
+    if (help2) {
+      dependencies.stdout(help2);
+      return 0;
+    }
+  }
   if (args2[0] === "call") {
     const operation = args2[1] ? dependencies.operations[args2[1]] : void 0;
     if (!operation || !isCallableAgentOperation(operation)) {
@@ -16511,6 +16541,37 @@ async function runCli(args2, dependencies) {
 `);
   return 1;
 }
+function callHelp() {
+  return `intoNear ERP CLI \xB7 call
+
+\u7528\u6CD5\uFF1A
+  intonear-erp-cli call <operationId> [--\u53C2\u6570 \u503C]
+
+\u5148\u8FD0\u884C intonear-erp-cli list \u53D1\u73B0 operationId\uFF0C\u518D\u8FD0\u884C
+intonear-erp-cli describe <operationId> \u67E5\u770B\u5B8C\u6574\u53C2\u6570\u5951\u7EA6\u3002
+JSON \u8BF7\u6C42\u4F53\u4F7F\u7528 --body\uFF0C\u6587\u4EF6\u4F7F\u7528 --file\u3002
+`;
+}
+function commandGroupHelp(group, operations2) {
+  const commands = Object.values(operations2).filter(isCallableAgentOperation).flatMap((operation) => {
+    const [candidateGroup, subcommand] = operation.command?.split(" ") ?? [];
+    return candidateGroup === group && subcommand ? [{ operation, subcommand }] : [];
+  }).sort((left, right) => left.subcommand.localeCompare(right.subcommand));
+  if (commands.length === 0) return void 0;
+  const commandLines = commands.map(
+    ({ operation, subcommand }) => `  ${subcommand.padEnd(16)} ${operation.summary ?? operation.operationId}`
+  ).join("\n");
+  return `intoNear ERP CLI \xB7 ${group}
+
+\u7528\u6CD5\uFF1A
+  intonear-erp-cli ${group} <\u5B50\u547D\u4EE4> [...]
+
+\u5B50\u547D\u4EE4\uFF1A
+${commandLines}
+
+\u8FD0\u884C intonear-erp-cli describe <operationId> \u67E5\u770B\u5B8C\u6574\u53C2\u6570\u5951\u7EA6\u3002
+`;
+}
 function parseDomainArguments(operation, args2) {
   const pathNames = operation.request.path ? Object.keys(operation.request.path.shape) : [];
   const values = {};
@@ -16670,7 +16731,7 @@ function createCredentialStore(path = defaultCredentialPath(), options = {}) {
 // package.json
 var package_default = {
   name: "intonear-erp-cli",
-  version: "0.2.1",
+  version: "0.2.2",
   description: "intoNear ERP \u6E10\u8FDB\u5F0F\u8BFB\u5199\u547D\u4EE4\u884C\u5BA2\u6237\u7AEF",
   type: "module",
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intonear-erp-cli",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "intoNear ERP 渐进式读写命令行客户端",
   "type": "module",
   "bin": {