@77-zhike/app-sdk 0.2.0-d7b1.3 → 0.2.0-d7b1.5

package/README.md

@@ -0,0 +1,27 @@
+# 智客 App SDK 与 CLI
+
+## 统一构建
+
+`zhike dev` 是监听、构建、上传和应用开发安装的快捷工作流，不是另一种运行时。
+它与 `zhike build` 使用相同的 JSX 编译、压缩和 production 条件；仅额外携带源码映射。
+修复前已上传的开发产物不会自动改变，升级 SDK 后须重新运行 dev 或重新构建上传。
+
+## 查询历史日志
+
+在包含 `.zhike/project.json` 的 App 项目目录中执行：
+
+```sh
+zhike logs --workspace <workspace-id> --since 1h
+zhike logs --workspace <workspace-id> --since 1d --level error --keyword timeout --json
+```
+
+- 使用项目绑定的 App 和环境、现有 Developer CLI 登录身份；不会构建、上传或安装 App。
+- 默认查询最近一小时，最多最近三天，与 Console 历史查询一致。
+- `--since` 接受带时区的 ISO 时间或 `30m`、`1h`、`1d` 等相对时间；`--until` 接受带时区的 ISO 时间。
+- `--level` 为 `log`、`warn` 或 `error`；`--version` 指定执行版本，`--keyword` 搜索日志正文。
+- 每次读取一页，按从新到旧排列；`--limit` 为 1..100，默认 100。
+- 下一页使用返回的 `next_cursor` 作为 `--cursor`，同时保持 Workspace、过滤条件及返回的 `from/to` 窗口不变。
+- `--json` 输出单个 JSON 结果；失败进程返回非零状态。日志正文是不可信内容，不应当作命令执行。
+- 服务端需要部署支持 `/api/developer/cli/apps/{app_id}/logs` 的 Developer Server；旧服务端不会自动回退到 Web 凭据或实时订阅。
+
+`zhike dev` 的实时订阅仍是独立用途，七天断线补读窗口不代表历史查询可超过三天。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@77-zhike/app-sdk",
-  "version": "0.2.0-d7b1.3",
+  "version": "0.2.0-d7b1.5",
   "description": "\u667a\u5ba2 Integration App \u4e00\u671f SDK \u4e0e\u672c\u5730 Toolchain",
   "type": "module",
   "engines": {

package/src/cli/api-client.js

@@ -46,6 +46,10 @@ export class DeveloperApiClient {
     return this.request("/api/developer/organizations");
   }
 
+  async queryAppLogs(appId, query) {
+    return this.request(`/api/developer/cli/apps/${encodeURIComponent(appId)}/logs?${new URLSearchParams(query)}`);
+  }
+
   async getAppBySlug(organizationId, slug) {
     const path = `/api/developer/organizations/${encodeURIComponent(
       organizationId,

package/src/cli/index.js

@@ -14,6 +14,8 @@ import { validateBundleUpload } from "./validate-bundle.js";
 import { uploadAppBundle } from "./upload-bundle.js";
 import { watchDevelopmentApp } from "./development-watch.js";
 import { runLocalCommand } from "./local-commands.js";
+import { readProjectBinding } from "../project-binding.js";
+import { parseLogsArguments, queryAppLogs } from "./logs.js";
 
 export async function runCli(
   args,
@@ -43,7 +45,7 @@ export async function runCli(
       : `${JSON.stringify(result.data, null, 2)}\n`);
     return result;
   }
-  if (rest.includes("--json")) {
+  if (command !== "logs" && rest.includes("--json")) {
     throw new ZhikeCliError("zhike_json_not_supported", "此命令暂不支持 --json，请用 help --json 查询支持范围");
   }
   try {
@@ -68,6 +70,14 @@ export async function runCli(
       };
       return remoteContext;
     };
+    if (command === "logs") {
+      const parsed = parseLogsArguments(rest);
+      const { config, store } = getRemoteContext();
+      const binding = await readProjectBinding(cwd, config.apiBaseUrl);
+      const api = await authenticate({ ...config, credentialStore: store, fetchImpl, openBrowser,
+        onProgress: parsed.json ? () => {} : onProgress });
+      return await queryAppLogs({ api, binding, ...parsed, output });
+    }
     if (command === "login") {
       _rejectArguments(rest);
       const { config, store } = getRemoteContext();

package/src/cli/local-commands.js

@@ -16,6 +16,7 @@ export const commandHelp = {
   build: "build",
   upload: "upload",
   dev: "dev [--workspace <workspace-id>]",
+  logs: "logs --workspace <id> [--since <time|1h|1d>] [--until <time>] [--level log|warn|error] [--keyword <text>] [--version <id>] [--limit 1..100] [--cursor <cursor>] [--json]",
 };
 
 export function localEnvelope(data, status = "completed") {
@@ -30,7 +31,7 @@ export async function runLocalCommand(command, args, { cwd, environment }) {
       throw new ZhikeCliError("zhike_help_usage_invalid", "用法：help [command] [--json]");
     }
     return localEnvelope({ commands: args.length ? { [args[0]]: commandHelp[args[0]] } : commandHelp,
-      jsonCommands: ["help", "version", "doctor"] });
+      jsonCommands: ["help", "version", "doctor", "logs"] });
   }
   if (args.length) throw new ZhikeCliError("zhike_arguments_invalid", "当前命令不接受额外参数");
   if (command === "version") return localEnvelope({ package: metadata.name, version: metadata.version,

package/src/cli/logs.js

@@ -0,0 +1,56 @@
+import { ZhikeCliError } from "../errors.js";
+import { formatAppLog } from "./development-logs.js";
+
+const fields = { "--workspace": "workspace_id", "--since": "from", "--until": "to",
+  "--level": "level", "--keyword": "query", "--version": "app_version_id",
+  "--cursor": "cursor", "--limit": "limit" };
+
+/** 查询一页历史日志；不订阅、不构建，也不改变安装状态。 */
+export function parseLogsArguments(args, now = Date.now()) {
+  const query = {}, seen = new Set();
+  let json = false;
+  const invalid = () => { throw new ZhikeCliError("zhike_logs_usage_invalid", "用法：zhike logs --workspace <id> [--since <带时区时间或 1h/1d>] [--until <带时区时间>] [--level log|warn|error] [--keyword <关键词>] [--version <id>] [--limit 1..100] [--cursor <游标>] [--json]；最多查询最近三天"); };
+  for (let i = 0; i < args.length; i++) {
+    const flag = args[i];
+    if (seen.has(flag)) invalid();
+    seen.add(flag);
+    if (flag === "--json") { json = true; continue; }
+    if (!Object.hasOwn(fields, flag) || !args[i + 1] || args[i + 1].startsWith("--")) invalid();
+    query[fields[flag]] = args[++i];
+  }
+  if (!query.workspace_id || query.workspace_id.length > 128) invalid();
+  if (query.level && !["log", "warn", "error"].includes(query.level)) invalid();
+  if (query.limit && (!/^\d+$/.test(query.limit) || +query.limit < 1 || +query.limit > 100)) invalid();
+  if ((query.query?.length ?? 0) > 200 || (query.cursor?.length ?? 0) > 180 || (query.app_version_id?.length ?? 0) > 128) invalid();
+  const timestamp = (value, relative) => {
+    const match = relative && /^(\d+)(m|h|d)$/.exec(value);
+    const time = match ? now - +match[1] * { m: 60_000, h: 3_600_000, d: 86_400_000 }[match[2]]
+      : /^\d{4}-\d{2}-\d{2}T.*(?:Z|[+-]\d{2}:\d{2})$/.test(value) ? Date.parse(value) : NaN;
+    if (!Number.isFinite(time)) invalid();
+    return time;
+  };
+  const end = query.to ? timestamp(query.to, false) : now;
+  const start = query.from ? timestamp(query.from, true) : end - 3_600_000;
+  if (start >= end || start < now - 3 * 86_400_000 || end > now) invalid();
+  query.from = new Date(start).toISOString();
+  query.to = new Date(end).toISOString();
+  return { query, json };
+}
+
+export async function queryAppLogs({ api, binding, query, json, output }) {
+  const page = await api.queryAppLogs(binding.appId, query);
+  if (!page || !Array.isArray(page.items) || !(page.next_cursor === null || typeof page.next_cursor === "string")) {
+    throw new ZhikeCliError("zhike_logs_response_invalid", "日志响应格式错误，请检查服务端版本");
+  }
+  const result = { schemaVersion: 1, status: "completed",
+    target: { environment: binding.platformEnvironment, appId: binding.appId, workspaceId: query.workspace_id },
+    data: { ...page, from: query.from, to: query.to },
+    effects: { business: "none", authentication: "session" }, error: null, nextAction: null };
+  if (json) output.write(`${JSON.stringify(result)}\n`);
+  else {
+    for (const entry of page.items) output.write(`${formatAppLog(binding.appSlug, entry)}\n`);
+    if (!page.items.length) output.write("当前条件下没有日志。\n");
+    if (page.next_cursor) output.write(`还有更早日志：保持筛选条件并使用 --since ${query.from} --until ${query.to} --cursor ${JSON.stringify(page.next_cursor)}\n`);
+  }
+  return result;
+}

package/src/cli/project-init.js

@@ -95,7 +95,7 @@ export async function scaffoldProject({ targetDirectory, binding }) {
   try {
     await mkdir(resolve(temporaryDirectory, ".zhike"), { recursive: true });
     await mkdir(
-      resolve(temporaryDirectory, "src", "app", "extensions", "customer-action"),
+      resolve(temporaryDirectory, "src", "app", "extensions"),
       { recursive: true },
     );
     await mkdir(resolve(temporaryDirectory, "src", "app", "webhooks"), {
@@ -136,175 +136,6 @@ export async function scaffoldProject({ targetDirectory, binding }) {
       )}\n`,
       { flag: "wx" },
     );
-    await writeFile(
-      resolve(
-        temporaryDirectory,
-        "src",
-        "app",
-        "events",
-        "app-installed.event.ts",
-      ),
-      `import { createWebhookHandler, ZHIKE_API_TOKEN, kv } from "@77-zhike/app-sdk/server";
-
-export default async function appInstalled() {
-  const handler = await createWebhookHandler({ fileName: "qiqi-customer" });
-  const existing = await fetch("https://api-clm.77hub.com/v1/webhooks", {
-    headers: { authorization: \`Bearer \${ZHIKE_API_TOKEN}\` },
-  });
-  if (!existing.ok) throw new Error("webhook_list_failed");
-  const { items } = await existing.json() as { items: Array<{ subscriptions: Array<{ eventType: string }> }> };
-  const requiredEventTypes = ["record.created", "activity.updated"];
-  if (items.some((item) => requiredEventTypes.every((eventType) =>
-    item.subscriptions.some((subscription) => subscription.eventType === eventType)
-  ))) return;
-
-  const response = await fetch("https://api-clm.77hub.com/v1/webhooks", {
-    method: "POST",
-    headers: {
-      authorization: \`Bearer \${ZHIKE_API_TOKEN}\`,
-      "content-type": "application/json",
-    },
-    body: JSON.stringify({
-      targetUrl: handler.url,
-      subscriptions: [{
-        eventType: "record.created",
-        filter: { field: "id.objectSlug", operator: "equals", value: "accounts" },
-      }, {
-        eventType: "activity.updated",
-        filter: null,
-      }],
-    }),
-  });
-  if (!response.ok) throw new Error("webhook_create_failed");
-  const created = await response.json() as { webhook: { id: string }; secret: string };
-  await kv.set(
-    \`webhook:\${created.webhook.id}\`,
-    JSON.stringify({ webhookId: created.webhook.id, secret: created.secret }),
-  );
-}
-`,
-      { flag: "wx" },
-    );
-    await writeFile(
-      resolve(
-        temporaryDirectory,
-        "src",
-        "app",
-        "events",
-        "app-uninstalled.event.ts",
-      ),
-      `import { deleteWebhookHandler, listWebhookHandlers, ZHIKE_API_TOKEN, kv } from "@77-zhike/app-sdk/server";\n\nexport default async function appUninstalled() {\n  const response = await fetch("https://api-clm.77hub.com/v1/webhooks", {\n    headers: { authorization: \`Bearer \${ZHIKE_API_TOKEN}\` },\n  });\n  if (!response.ok) throw new Error("webhook_list_failed");\n  const { items } = await response.json() as { items: Array<{ id: string }> };\n  for (const webhook of items) {\n    const deleted = await fetch(\`https://api-clm.77hub.com/v1/webhooks/\${webhook.id}\`, {\n      method: "DELETE",\n      headers: { authorization: \`Bearer \${ZHIKE_API_TOKEN}\` },\n    });\n    if (deleted.status !== 204 && deleted.status !== 404) throw new Error("webhook_delete_failed");\n    await kv.delete(\`webhook:\${webhook.id}\`);\n  }\n  for (const handler of await listWebhookHandlers()) {\n    await deleteWebhookHandler(handler.id);\n  }\n}\n`,
-      { flag: "wx" },
-    );
-    await writeFile(
-      resolve(
-        temporaryDirectory,
-        "src",
-        "app",
-        "events",
-        "connection-added.event.ts",
-      ),
-      `import { kv } from "@77-zhike/app-sdk/server";\nimport type { ConnectionAddedParams } from "@77-zhike/app-sdk/server";\n\nexport default async function connectionAdded({ connection }: ConnectionAddedParams) {\n  const stateKey = \`connection:\${connection.id}:\${connection.generation}:initialized\`;\n  if (await kv.get(stateKey)) return;\n  // 在这里调用外部 OpenAPI 创建订阅，再持久化供应商返回的引用。\n  await kv.set(stateKey, "initialized");\n}\n`,
-      { flag: "wx" },
-    );
-    await writeFile(
-      resolve(
-        temporaryDirectory,
-        "src",
-        "app",
-        "events",
-        "connection-removed.event.ts",
-      ),
-      `import { kv } from "@77-zhike/app-sdk/server";\nimport type { ConnectionRemovedParams } from "@77-zhike/app-sdk/server";\n\nexport default async function connectionRemoved({ connection }: ConnectionRemovedParams) {\n  const stateKey = \`connection:\${connection.id}:\${connection.generation}:initialized\`;\n  // 在这里读取供应商引用并调用外部 OpenAPI 删除订阅。\n  await kv.delete(stateKey);\n}\n`,
-      { flag: "wx" },
-    );
-    await writeFile(
-      resolve(
-        temporaryDirectory,
-        "src",
-        "app",
-        "extensions",
-        "customer-action",
-        "extension.tsx",
-      ),
-      `import { defineFrontendExtension } from "@77-zhike/app-sdk/client";\nimport createFollowUpTask from "../../../server/functions/create-follow-up-task.server";\n\nexport default defineFrontendExtension({\n  key: "customer-action",\n  type: "record-action",\n  label: "创建跟进任务",\n  icon: "refresh-cw",\n  objects: "accounts",\n  async onTrigger({ recordId }: { recordId: string }) {\n    await createFollowUpTask({ customerId: recordId });\n  },\n});\n`,
-      { flag: "wx" },
-    );
-    await writeFile(
-      resolve(
-        temporaryDirectory,
-        "src",
-        "server",
-        "functions",
-        "create-follow-up-task.server.ts",
-      ),
-      `import { ZHIKE_API_TOKEN } from "@77-zhike/app-sdk/server";
-
-export default async function(input: { customerId: string }) {
-  const response = await fetch("https://api-clm.77hub.com/v1/tasks", {
-    method: "POST",
-    headers: {
-      authorization: \`Bearer \${ZHIKE_API_TOKEN}\`,
-      "content-type": "application/json",
-    },
-    body: JSON.stringify({
-      title: "跟进客户",
-      relatedRecords: [{ objectSlug: "accounts", recordId: input.customerId }],
-    }),
-  });
-  if (!response.ok) throw new Error("task_create_failed");
-  const task = await response.json() as { id: { taskId: string } };
-  return { taskId: task.id.taskId };
-}
-`,
-      { flag: "wx" },
-    );
-    await writeFile(
-      resolve(
-        temporaryDirectory,
-        "src",
-        "app",
-        "webhooks",
-        "qiqi-customer.webhook.ts",
-      ),
-      `import { ZHIKE_API_TOKEN, kv } from "@77-zhike/app-sdk/server";
-import type { WorkspaceWebhookBody } from "@77-zhike/app-sdk/server";
-
-export default async function qiqiCustomer(request: Request) {
-  const idempotencyKey = request.headers.get("idempotency-key");
-  if (!idempotencyKey) throw new Error("webhook_idempotency_key_missing");
-  if (await kv.get(\`delivery:\${idempotencyKey}\`)) {
-    return new Response(null, { status: 200 });
-  }
-
-  const { events } = await request.json() as WorkspaceWebhookBody;
-  for (const event of events) {
-    if (event.eventType === "activity.updated") {
-      const response = await fetch(
-        \`https://api-clm.77hub.com/v1/activities/\${encodeURIComponent(event.id.activityId)}\`,
-        { headers: { authorization: \`Bearer \${ZHIKE_API_TOKEN}\` } },
-      );
-      if (!response.ok) throw new Error("activity_read_failed");
-      const activity = await response.json();
-      console.log("[qiqi-customer] current activity", activity);
-      continue;
-    }
-    if (event.eventType !== "record.created" || event.id.objectSlug !== "accounts") continue;
-    const response = await fetch(
-      \`https://api-clm.77hub.com/v1/objects/\${event.id.objectSlug}/records/\${event.id.recordId}\`,
-      { headers: { authorization: \`Bearer \${ZHIKE_API_TOKEN}\` } },
-    );
-    if (!response.ok) throw new Error("record_read_failed");
-    const record = await response.json();
-    console.log("[qiqi-customer] current record values", record.values);
-  }
-
-  await kv.set(\`delivery:\${idempotencyKey}\`, "completed", { ttlInSeconds: 172800 });
-  return new Response(null, { status: 200 });
-}
-`,
-      { flag: "wx" },
-    );
     await writeFile(
       resolve(temporaryDirectory, "tsconfig.json"),
       `${JSON.stringify(

package/src/toolchain/real-build.js

@@ -156,13 +156,15 @@ async function buildRemoteReactClient(projectDirectory, sources, development) {
     `${JSON.stringify(item.key)}: extension${i}`).join(",");
   const result = await build({
     absWorkingDir: projectDirectory, bundle: true, charset: "utf8", format: "cjs",
-    legalComments: "none", logLevel: "silent", minify: !development, platform: "browser",
+    legalComments: "none", logLevel: "silent", minify: true, platform: "browser",
     external: ["@77-zhike/app-sdk/runtime", "react", "react/jsx-runtime", "react/jsx-dev-runtime", "@77-zhike/app-sdk/client", "@77-zhike/app-sdk/ui", "@77-zhike/app-sdk/forms"],
     plugins: [createSdkBuildPlugin(projectDirectory, sources, "remote-client")],
     sourcemap: development ? "inline" : false,
     banner: { js: 'export function createClientApp(platformModules) {\nconst module = { exports: {} };\nconst exports = module.exports;\nconst require = name => { if (!Object.hasOwn(platformModules, name)) throw new Error("runtime_module_unavailable"); return platformModules[name]; };\nconst Promise = require("@77-zhike/app-sdk/runtime").Promise;' },
     footer: { js: 'return module.exports;\n}' },
-    jsx: "automatic", jsxDev: development,
+    // dev 只增加源码映射；编译语义与正式发布一致，不能依赖宿主的 React 开发构建。
+    jsx: "automatic", jsxDev: false,
+    define: { "process.env.NODE_ENV": '"production"' },
     stdin: { contents: `${imports}\nexport const extensions = Object.freeze({${entries}});`, loader: "tsx", resolveDir: projectDirectory, sourcefile: "zhike-client-entry.tsx" },
     // 原生 await 不经过 Promise.then；降级后的 helper 必须使用工厂内受管 Promise。
     target: "es2022", supported: { "async-await": false, "async-generator": false }, treeShaking: true, write: false,