@lark-project/meegle 0.0.1 → 0.0.2

package/dist/bin/meegle.js

@@ -738,45 +738,57 @@ async function startDeviceCodeInit(host, customHeaders) {
     client_id: client.client_id
   };
 }
-async function startDeviceCodePoll(options) {
+async function pollDeviceCodeOnce(options) {
   const metadata = await fetchOAuthMetadata(options.host, options.customHeaders);
-  let interval = options.interval * 1e3;
-  const deadline = Date.now() + options.expires_in * 1e3;
-  while (Date.now() < deadline) {
-    await sleep(interval);
-    const tokenRes = await fetch(metadata.token_endpoint, {
-      method: "POST",
-      headers: { "Content-Type": "application/x-www-form-urlencoded", ...options.customHeaders },
-      body: new URLSearchParams({
-        grant_type: "urn:ietf:params:oauth:grant-type:device_code",
-        device_code: options.device_code,
-        client_id: options.client_id
-      })
-    });
-    const tokenRaw = await tokenRes.json();
-    const data = tokenRaw.access_token || tokenRaw.error ? tokenRaw : tokenRaw.data ?? tokenRaw;
-    if (data.access_token) {
-      return {
+  const tokenRes = await fetch(metadata.token_endpoint, {
+    method: "POST",
+    headers: { "Content-Type": "application/x-www-form-urlencoded", ...options.customHeaders },
+    body: new URLSearchParams({
+      grant_type: "urn:ietf:params:oauth:grant-type:device_code",
+      device_code: options.device_code,
+      client_id: options.client_id
+    })
+  });
+  const tokenRaw = await tokenRes.json();
+  const data = tokenRaw.access_token || tokenRaw.error ? tokenRaw : tokenRaw.data ?? tokenRaw;
+  if (data.access_token) {
+    return {
+      status: "ok",
+      token_data: {
         accessToken: data.access_token,
         refreshToken: data.refresh_token,
         clientId: options.client_id,
         expiresAt: data.expires_in ? Date.now() + data.expires_in * 1e3 : void 0
-      };
+      }
+    };
+  }
+  if (data.error === "slow_down") return { status: "slow_down" };
+  if (data.error === "authorization_pending") return { status: "authorization_pending" };
+  if (data.error === "expired_token") return { status: "expired_token" };
+  throw new ServerError(
+    `Device Code \u6388\u6743\u5931\u8D25: ${data.error ?? "\u672A\u77E5\u9519\u8BEF"}`,
+    "DEVICE_CODE_FAILED"
+  );
+}
+async function startDeviceCodePoll(options) {
+  let interval = options.interval * 1e3;
+  const deadline = Date.now() + options.expires_in * 1e3;
+  while (Date.now() < deadline) {
+    await sleep(interval);
+    const result = await pollDeviceCodeOnce(options);
+    if (result.status === "ok" && result.token_data) {
+      return result.token_data;
     }
-    if (data.error === "slow_down") {
+    if (result.status === "slow_down") {
       interval += 5e3;
       continue;
     }
-    if (data.error === "authorization_pending") {
+    if (result.status === "authorization_pending") {
       continue;
     }
-    if (data.error === "expired_token") {
+    if (result.status === "expired_token") {
       throw new ClientError("\u6388\u6743\u5DF2\u8D85\u65F6\uFF0C\u8BF7\u91CD\u65B0\u6267\u884C meegle auth login --device-code", "DEVICE_CODE_EXPIRED");
     }
-    throw new ServerError(
-      `Device Code \u6388\u6743\u5931\u8D25: ${data.error ?? "\u672A\u77E5\u9519\u8BEF"}`,
-      "DEVICE_CODE_FAILED"
-    );
   }
   throw new ClientError("\u6388\u6743\u5DF2\u8D85\u65F6\uFF0C\u8BF7\u91CD\u65B0\u6267\u884C meegle auth login --device-code", "DEVICE_CODE_EXPIRED");
 }
@@ -957,7 +969,7 @@ async function resolveHost(profile, hostFlag) {
   return host;
 }
 function registerLogin(auth) {
-  auth.command("login").description("\u767B\u5F55\u98DE\u4E66\u9879\u76EE").option("--device-code", "\u4F7F\u7528 Device Code \u6D41\u7A0B\uFF08\u65E0\u6D4F\u89C8\u5668\u73AF\u5883\uFF09").option("--phase <phase>", "Device Code \u9636\u6BB5: init \u6216 poll").option("--host <host>", "\u6307\u5B9A\u7AD9\u70B9\u57DF\u540D\uFF08\u8DF3\u8FC7\u4EA4\u4E92\u5F0F\u9009\u62E9\uFF09").option("--device-code-value <code>", "poll \u9636\u6BB5\u7684 device_code").option("--client-id <id>", "poll \u9636\u6BB5\u7684 client_id").option("--interval <seconds>", "poll \u8F6E\u8BE2\u95F4\u9694\uFF08\u79D2\uFF09", "5").option("--expires-in <seconds>", "poll \u8D85\u65F6\u65F6\u95F4\uFF08\u79D2\uFF09", "600").option("--format <format>", "\u8F93\u51FA\u683C\u5F0F: json, table, ndjson", "table").action(async (options) => {
+  auth.command("login").description("\u767B\u5F55\u98DE\u4E66\u9879\u76EE").option("--device-code", "\u4F7F\u7528 Device Code \u6D41\u7A0B\uFF08\u65E0\u6D4F\u89C8\u5668\u73AF\u5883\uFF09").option("--phase <phase>", "Device Code \u9636\u6BB5: init \u6216 poll").option("--host <host>", "\u6307\u5B9A\u7AD9\u70B9\u57DF\u540D\uFF08\u8DF3\u8FC7\u4EA4\u4E92\u5F0F\u9009\u62E9\uFF09").option("--device-code-value <code>", "poll \u9636\u6BB5\u7684 device_code").option("--client-id <id>", "poll \u9636\u6BB5\u7684 client_id").option("--interval <seconds>", "poll \u8F6E\u8BE2\u95F4\u9694\uFF08\u79D2\uFF09", "5").option("--expires-in <seconds>", "poll \u8D85\u65F6\u65F6\u95F4\uFF08\u79D2\uFF09", "600").option("--once", "poll \u9636\u6BB5\u5355\u6B21\u5C1D\u8BD5\uFF0C\u7ACB\u5373\u8FD4\u56DE\u7ED3\u679C\uFF08\u4E0D\u963B\u585E\uFF09").option("--format <format>", "\u8F93\u51FA\u683C\u5F0F: json, table, ndjson", "table").action(async (options) => {
     const profileName = auth.parent?.opts().profile ?? await getCurrentProfileName();
     const format = validateFormat(options.format);
     const config = await loadConfig(profileName);
@@ -978,6 +990,23 @@ function registerLogin(auth) {
         throw new ClientError("--phase poll \u9700\u8981 --device-code-value \u548C --client-id", "MISSING_OPTION");
       }
       const host2 = await resolveHost(profileName, options.host);
+      if (options.once) {
+        const result = await pollDeviceCodeOnce({
+          host: host2,
+          device_code: options.deviceCodeValue,
+          client_id: options.clientId,
+          customHeaders: config.headers
+        });
+        if (result.status === "ok" && result.token_data) {
+          const store3 = await createTokenStore(profileName);
+          const tokenManager3 = new TokenManager(store3, host2);
+          await tokenManager3.saveToken(result.token_data);
+          console.log(formatOutput({ status: "ok", message: "\u767B\u5F55\u6210\u529F" }, format));
+        } else {
+          console.log(formatOutput({ status: result.status }, format));
+        }
+        return;
+      }
       const tokenData2 = await startDeviceCodePoll({
         host: host2,
         device_code: options.deviceCodeValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-project/meegle",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Agent-First CLI for Meegle (Lark Project)",
   "type": "module",
   "bin": {