@helpfeel/cosense-cli 1.11.1 → 1.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helpfeel/cosense-cli",
-  "version": "1.11.1",
+  "version": "1.12.1",
   "description": "Cosense (旧Scrapbox) のページを読み・調べ・編集するAgent Skill用のCLI",
   "homepage": "https://github.com/helpfeel/cosense-cli",
   "license": "MIT",
@@ -24,13 +24,13 @@
     "format": "oxfmt"
   },
   "dependencies": {
-    "tsx": "4.23.10"
+    "tsx": "4.23.12"
   },
   "devDependencies": {
     "@types/node": "24.13.3",
     "npm-run-all": "4.1.5",
-    "oxfmt": "0.61.0",
-    "oxlint": "1.76.0",
+    "oxfmt": "0.62.0",
+    "oxlint": "1.77.0",
     "typescript": "7.0.2"
   },
   "engines": {

package/src/cli.ts

@@ -73,6 +73,11 @@ import {
   submitEditHelp,
   submitEditSummary
 } from './commands/submitEdit.ts';
+import {
+  uploadFile,
+  uploadFileHelp,
+  uploadFileSummary
+} from './commands/uploadFile.ts';
 import {
   search1hopLinks,
   search1hopLinksHelp,
@@ -144,6 +149,11 @@ const commands: Record<string, CommandSpec> = {
     summary: downloadFileSummary,
     help: downloadFileHelp
   },
+  uploadFile: {
+    handler: uploadFile,
+    summary: uploadFileSummary,
+    help: uploadFileHelp
+  },
   readProjectMembers: {
     handler: readProjectMembers,
     summary: readProjectMembersSummary,
@@ -232,7 +242,9 @@ if (command === '--version') {
   process.exit(0);
 }
 
-const spec = command ? commands[command] : undefined;
+// cosense constructorやcosense __proto__はObject.prototypeのpropertyを引いてしまう
+const spec =
+  command && Object.hasOwn(commands, command) ? commands[command] : undefined;
 if (!spec) {
   process.stderr.write(
     `invalid command${command ? `: ${command}` : ''}\n` +

package/src/commands/readProjectMembers.ts

@@ -14,6 +14,7 @@ Usage:
   <projectUrl>  プロジェクトのURL（例: https://scrapbox.io/shokai）
 
 戻り値（top-levelの主なkey）:
+  projectId               string                 projectのID
   users                   Array<User>            現メンバー一覧
   memberSnapshots         Array<Snapshot>?       退去済みメンバーの記録
   serviceAccounts         Array<ServiceAccount>? Service Account一覧
@@ -42,6 +43,7 @@ ServiceAccount の field:
 
 戻り値のJSON抜粋例:
 {
+  "projectId": "58043f...",
   "users": [
     {
       "id": "5724627723541f110097c291",

package/src/commands/uploadFile.ts

@@ -0,0 +1,183 @@
+import { createHash } from 'node:crypto';
+import { readFile, stat } from 'node:fs/promises';
+import { basename } from 'node:path';
+import { contentTypeForFile } from '../lib/mimeTypes.ts';
+import { parseProjectUrlStrict } from '../lib/parseUrl.ts';
+import { requestJson } from '../lib/request.ts';
+import { resolveProjectId } from '../lib/resolveProjectId.ts';
+import { resolveCredential } from '../lib/settings.ts';
+
+export const uploadFileSummary =
+  'ファイルをprojectにアップロードして埋め込みURLを取得する';
+
+export const uploadFileHelp = `uploadFile - ファイルをprojectにアップロードして埋め込みURLを取得する
+
+Usage:
+  cosense uploadFile <projectUrl> <filePath> [--content-type <type>]
+
+引数:
+  <projectUrl>  アップロード先projectのURL（例: https://scrapbox.io/example）。末尾に余分なpathがあるとerror
+  <filePath>    アップロードするローカルファイルのパス
+
+オプション:
+  --content-type <type>  ファイルのMIME type
+
+出力（JSON）:
+  embedUrl      string   ページ本文への埋め込みに使うファイルURL
+  originalname  string   アップロードしたファイル名
+  contentType   string?  ファイルのMIME type
+  size          number   ファイルのbyte数
+
+例:
+  cosense uploadFile 'https://scrapbox.io/example' ./photo.png
+  cosense uploadFile 'https://scrapbox.io/example' ./data.bin --content-type application/x-foo
+
+HTTPエラー:
+  401/403: 認証・権限が無い。projectのmember権限（またはprojectのService Account）が必要
+  402: projectのファイル容量上限を超えている
+`;
+
+interface ParsedArgs {
+  projectUrl: string;
+  filePath: string;
+  contentType?: string;
+}
+
+const parseArgs = (args: string[]): ParsedArgs => {
+  const usage =
+    'Usage: cosense uploadFile <projectUrl> <filePath> [--content-type <type>]';
+  let contentType: string | undefined;
+  const positional: string[] = [];
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = args[i] as string;
+    if (arg === '--content-type') {
+      if (contentType !== undefined) {
+        throw new Error(`--content-type specified multiple times\n${usage}`);
+      }
+      const value = args[i + 1];
+      if (!value || value.startsWith('--')) {
+        throw new Error(`--content-type requires a value\n${usage}`);
+      }
+      contentType = value;
+      i += 1;
+    } else if (arg.startsWith('--')) {
+      throw new Error(`Unknown option: ${arg}\n${usage}`);
+    } else {
+      positional.push(arg);
+    }
+  }
+  if (positional.length !== 2) {
+    throw new Error(usage);
+  }
+  return {
+    projectUrl: positional[0] as string,
+    filePath: positional[1] as string,
+    contentType
+  };
+};
+
+// request.tsのHttpErrorは401/403でcosense loginを案内するが、GCSのsigned URLへの
+// PUT失敗にログイン案内は誤誘導なので専用のエラーメッセージを組み立てる
+const uploadToSignedUrl = async (
+  url: string,
+  body: Uint8Array,
+  contentType: string | undefined
+): Promise<void> => {
+  const res = await fetch(url, {
+    method: 'PUT',
+    headers: contentType ? { 'Content-Type': contentType } : {},
+    body
+  });
+  if (res.ok) {
+    await res.body?.cancel();
+    return;
+  }
+  const text = await res.text().catch(() => '');
+  let message = `Upload to signed URL failed: HTTP ${res.status} ${res.statusText}\n${text.slice(0, 500)}`;
+  if (res.status === 403) {
+    message += '\n\nしばらく待ってから再実行すると成功する事がある';
+  }
+  throw new Error(message);
+};
+
+interface UploadRequestResponse {
+  embedUrl?: string;
+  originalname?: string;
+  contentType?: string;
+  signedUrl?: string;
+  fileId?: string;
+}
+
+interface VerifyResponse {
+  embedUrl?: string;
+  originalname?: string;
+}
+
+export const uploadFile = async (args: string[]): Promise<void> => {
+  const { projectUrl, filePath, contentType: contentTypeArg } = parseArgs(args);
+  const { origin, projectName } = parseProjectUrlStrict(projectUrl);
+  const credential = resolveCredential(origin, projectName);
+  if (!credential) {
+    throw new Error(
+      `No credential found for ${origin}/${projectName}. Run \`cosense login ${origin}/${projectName}\` to authenticate.`
+    );
+  }
+
+  const fileStat = await stat(filePath).catch(() => null);
+  if (!fileStat?.isFile()) {
+    throw new Error(`<filePath> is not a file: ${filePath}`);
+  }
+
+  const body = await readFile(filePath);
+  const md5 = createHash('md5').update(body).digest('hex');
+  const contentType = contentTypeArg ?? contentTypeForFile(filePath);
+  const name = basename(filePath);
+
+  const projectId = await resolveProjectId(origin, projectName);
+
+  const uploadRequest = (await requestJson(
+    `${origin}/api/gcs/${projectId}/upload-request`,
+    {
+      credential,
+      method: 'POST',
+      body: { md5, size: body.length, contentType, name }
+    }
+  )) as UploadRequestResponse;
+
+  let embedUrl: string | undefined;
+  let originalname: string | undefined;
+  let resultContentType = contentType;
+  if (uploadRequest.embedUrl) {
+    // 同一ファイルがアップロード済みの場合、serverはupload-requestで即embedUrlを返す。
+    // embedUrlが配信するのは保存済みファイルなので、ローカル推定の型は当てにならない
+    embedUrl = uploadRequest.embedUrl;
+    originalname = uploadRequest.originalname ?? name;
+    resultContentType = uploadRequest.contentType?.trim() || undefined;
+  } else {
+    const { signedUrl, fileId } = uploadRequest;
+    if (!signedUrl || !fileId) {
+      throw new Error(
+        `Unexpected upload-request response: ${JSON.stringify(uploadRequest)}`
+      );
+    }
+    await uploadToSignedUrl(signedUrl, body, contentType);
+    const verify = (await requestJson(`${origin}/api/gcs/${projectId}/verify`, {
+      credential,
+      method: 'POST',
+      body: { md5, fileId }
+    })) as VerifyResponse;
+    embedUrl = verify.embedUrl;
+    originalname = verify.originalname ?? name;
+  }
+  if (!embedUrl) {
+    throw new Error('Unexpected response: embedUrl is missing.');
+  }
+
+  const result = {
+    embedUrl,
+    originalname,
+    contentType: resultContentType,
+    size: body.length
+  };
+  process.stdout.write(`${JSON.stringify(result, null, 2)}\n`);
+};

package/src/lib/mimeTypes.ts

@@ -0,0 +1,47 @@
+import { extname } from 'node:path';
+
+// アップロード時に申告するContent-Typeを拡張子から推定するマップ。網羅はしないが、
+// browsePageが<cosense:file type="...">でファイル種別をAIに伝えられるよう、判明した型は足していく。
+// ここに無い型は--content-typeで上書きしてもらう
+const MIME_TYPES: Record<string, string> = {
+  png: 'image/png',
+  jpg: 'image/jpeg',
+  jpeg: 'image/jpeg',
+  gif: 'image/gif',
+  webp: 'image/webp',
+  svg: 'image/svg+xml',
+  avif: 'image/avif',
+  mp4: 'video/mp4',
+  mov: 'video/quicktime',
+  webm: 'video/webm',
+  mp3: 'audio/mpeg',
+  wav: 'audio/wav',
+  m4a: 'audio/mp4',
+  ogg: 'audio/ogg',
+  weba: 'audio/webm',
+  aac: 'audio/aac',
+  pdf: 'application/pdf',
+  docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+  xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+  xlsm: 'application/vnd.ms-excel.sheet.macroEnabled.12',
+  pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+  doc: 'application/msword',
+  xls: 'application/vnd.ms-excel',
+  ppt: 'application/vnd.ms-powerpoint',
+  txt: 'text/plain',
+  md: 'text/markdown',
+  csv: 'text/csv',
+  tsv: 'text/tab-separated-values',
+  json: 'application/json',
+  html: 'text/html',
+  zip: 'application/zip'
+};
+
+// 推定できない時にapplication/octet-streamを申告しない。octet-streamで申告するとserverが
+// embedUrlから拡張子を落とすため、URLからファイル種別が読み取れなくなり、ページ本文での
+// 埋め込み表示の判定もできなくなる
+export const contentTypeForFile = (filePath: string): string | undefined => {
+  const ext = extname(filePath).slice(1).toLowerCase();
+  // a.constructorやa.__proto__はObject.prototypeのpropertyを引いてしまう
+  return Object.hasOwn(MIME_TYPES, ext) ? MIME_TYPES[ext] : undefined;
+};

package/src/lib/resolveProjectId.ts

@@ -0,0 +1,26 @@
+import { requestJson } from './request.ts';
+import { resolveCredential } from './settings.ts';
+
+const cache = new Map<string, string>();
+
+export const resolveProjectId = async (
+  origin: string,
+  projectName: string
+): Promise<string> => {
+  const cacheKey = `${origin}:${projectName.toLowerCase()}`;
+  const cached = cache.get(cacheKey);
+  if (cached) return cached;
+
+  const apiUrl = `${origin}/api/projects/${projectName}/users`;
+  const credential = resolveCredential(origin, projectName);
+  const data = (await requestJson(apiUrl, { credential })) as {
+    projectId?: unknown;
+  };
+  if (typeof data.projectId !== 'string' || data.projectId === '') {
+    throw new Error(
+      `projectId not found in ${apiUrl} response. The Cosense server may be older than this CLI.`
+    );
+  }
+  cache.set(cacheKey, data.projectId);
+  return data.projectId;
+};