fletchshot-mcp 0.1.5 → 0.1.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/agentAnnotations.js +141 -75
- package/dist/src/agentAnnotations.js.map +1 -1
- package/dist/src/capture.js +2 -2
- package/dist/src/capture.js.map +1 -1
- package/dist/src/draft.js +122 -12
- package/dist/src/draft.js.map +1 -1
- package/dist/src/index.js +25 -4
- package/dist/src/index.js.map +1 -1
- package/dist/src/swiftRunner.js +300 -0
- package/dist/src/swiftRunner.js.map +1 -0
- package/dist/src/vision.js +71 -72
- package/dist/src/vision.js.map +1 -1
- package/dist/src/waitForReturn.js +13 -0
- package/dist/src/waitForReturn.js.map +1 -1
- package/dist/src/windowList.js +21 -32
- package/dist/src/windowList.js.map +1 -1
- package/package.json +1 -1
|
@@ -43,7 +43,11 @@ export const AgentTextInputSchema = z.object({
|
|
|
43
43
|
"位置に自動で置く。{x,y}・[x,y]・{text,occurrence?}のいずれか"),
|
|
44
44
|
text: z.string().min(1),
|
|
45
45
|
width: z.number().positive().optional().describe("折り返し幅(画像ピクセル)。省略時は折り返さない"),
|
|
46
|
-
color: z
|
|
46
|
+
color: z
|
|
47
|
+
.string()
|
|
48
|
+
.optional()
|
|
49
|
+
.describe(COLOR_DESC +
|
|
50
|
+
"。white等の明るすぎる色は避ける(FletchShot 2.4.1以前は文字の白い縁取りと同化して潰れる)"),
|
|
47
51
|
});
|
|
48
52
|
export const AgentNumberInputSchema = z.object({
|
|
49
53
|
type: z.literal("number"),
|
|
@@ -82,14 +86,124 @@ export const AgentAnnotationInputSchema = z.discriminatedUnion("type", [
|
|
|
82
86
|
AgentMosaicInputSchema,
|
|
83
87
|
AgentNumberInputSchema,
|
|
84
88
|
]);
|
|
85
|
-
function
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
+
function queryKey(annotationIndex, field) {
|
|
90
|
+
return `${annotationIndex}:${field}`;
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* inputs中の文字アンカーのクエリを(Visionを呼ばずに)すべて洗い出す。rect/ellipse/mosaicの
|
|
94
|
+
* 「x/y/w/hとtextを同時に指定/どちらも指定しない」という構造的な誤りは、ここでVisionとは無関係の
|
|
95
|
+
* issueとして先に確定させる(classifyBucketは従来通りbucket===1側に落ちるが、hasCoordsが
|
|
96
|
+
* falseのままだとx/y/w/hがundefinedになるため、ここで検出しないと後段で不正な値を使ってしまう)。
|
|
97
|
+
*/
|
|
98
|
+
function collectAnchorQueries(inputs) {
|
|
99
|
+
const queries = [];
|
|
100
|
+
const structuralIssues = [];
|
|
101
|
+
inputs.forEach((input, annotationIndex) => {
|
|
102
|
+
switch (input.type) {
|
|
103
|
+
case "arrow":
|
|
104
|
+
if (isTextAnchorPoint(input.to)) {
|
|
105
|
+
queries.push({ annotationIndex, field: "arrow.to", text: input.to.text, occurrence: input.to.occurrence });
|
|
106
|
+
}
|
|
107
|
+
if (input.from !== undefined && isTextAnchorPoint(input.from)) {
|
|
108
|
+
queries.push({
|
|
109
|
+
annotationIndex,
|
|
110
|
+
field: "arrow.from",
|
|
111
|
+
text: input.from.text,
|
|
112
|
+
occurrence: input.from.occurrence,
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
return;
|
|
116
|
+
case "text":
|
|
117
|
+
case "number":
|
|
118
|
+
if (isTextAnchorPoint(input.at)) {
|
|
119
|
+
queries.push({
|
|
120
|
+
annotationIndex,
|
|
121
|
+
field: `${input.type}.at`,
|
|
122
|
+
text: input.at.text,
|
|
123
|
+
occurrence: input.at.occurrence,
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
return;
|
|
127
|
+
case "rect":
|
|
128
|
+
case "ellipse":
|
|
129
|
+
case "mosaic": {
|
|
130
|
+
const hasText = input.text !== undefined;
|
|
131
|
+
const hasCoords = input.x !== undefined && input.y !== undefined && input.w !== undefined && input.h !== undefined;
|
|
132
|
+
if (hasText === hasCoords) {
|
|
133
|
+
structuralIssues.push({
|
|
134
|
+
annotationIndex,
|
|
135
|
+
field: `${input.type}.region`,
|
|
136
|
+
query: input.text ?? "",
|
|
137
|
+
status: "no_match",
|
|
138
|
+
candidates: [],
|
|
139
|
+
});
|
|
140
|
+
return;
|
|
141
|
+
}
|
|
142
|
+
if (hasText) {
|
|
143
|
+
queries.push({
|
|
144
|
+
annotationIndex,
|
|
145
|
+
field: `${input.type}.region`,
|
|
146
|
+
text: input.text,
|
|
147
|
+
occurrence: input.occurrence,
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
return { queries, structuralIssues };
|
|
155
|
+
}
|
|
156
|
+
/**
|
|
157
|
+
* inputs中のすべての文字アンカーを画像ピクセル座標の矩形へ解決する(Vision呼び出しをここに集約)。
|
|
158
|
+
* 2026-11-13改訂: 以前は「行の一覧」と「部分文字列の精密な枠」を文字アンカーの数だけ別々のswift
|
|
159
|
+
* プロセスで求めていた(N件ならswift起動1+N回)。ここでは
|
|
160
|
+
* 1. listTextLines()を1回だけ呼ぶ(文字アンカーが1つも無ければ呼ばない)
|
|
161
|
+
* 2. 各クエリをpickTextAnchor()(Vision不要の純粋関数)でlines基準に解決する。完全一致は
|
|
162
|
+
* line.boxをそのまま使えるのでVisionの追加呼び出しは不要
|
|
163
|
+
* 3. 部分一致(精密な枠が必要なもの)だけをまとめて、boxForTextRanges()を最大1回だけ呼ぶ
|
|
164
|
+
* という2段構成にして、1回のopen_draftあたりのswift起動を最大2回(厳密一致のみ・解決失敗・
|
|
165
|
+
* 文字アンカー無しのときは1回)に抑える。
|
|
166
|
+
*/
|
|
167
|
+
async function resolveTextAnchorBoxes(imagePath, inputs, recognizer) {
|
|
168
|
+
const { queries, structuralIssues } = collectAnchorQueries(inputs);
|
|
169
|
+
const issues = [...structuralIssues];
|
|
170
|
+
if (queries.length === 0) {
|
|
171
|
+
if (issues.length > 0)
|
|
172
|
+
return { ok: false, issues };
|
|
173
|
+
return { ok: true, boxes: new Map(), lines: [] };
|
|
174
|
+
}
|
|
175
|
+
const lines = await recognizer.listTextLines(imagePath);
|
|
176
|
+
const boxes = new Map();
|
|
177
|
+
const pending = [];
|
|
178
|
+
for (const q of queries) {
|
|
179
|
+
const pick = pickTextAnchor(lines, q.text, q.occurrence);
|
|
180
|
+
if (pick.status !== "resolved") {
|
|
181
|
+
issues.push({
|
|
182
|
+
annotationIndex: q.annotationIndex,
|
|
183
|
+
field: q.field,
|
|
184
|
+
query: q.text,
|
|
185
|
+
occurrence: q.occurrence,
|
|
186
|
+
status: pick.status,
|
|
187
|
+
candidates: pick.candidates,
|
|
188
|
+
});
|
|
189
|
+
continue;
|
|
190
|
+
}
|
|
191
|
+
const m = pick.match;
|
|
192
|
+
const key = queryKey(q.annotationIndex, q.field);
|
|
193
|
+
if (m.exact) {
|
|
194
|
+
boxes.set(key, m.line.box);
|
|
195
|
+
}
|
|
196
|
+
else {
|
|
197
|
+
pending.push({ key, lineIndex: m.lineIndex, utf16Start: m.utf16Start, utf16Length: m.utf16Length });
|
|
198
|
+
}
|
|
89
199
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
200
|
+
if (pending.length > 0) {
|
|
201
|
+
const rangeBoxes = await recognizer.boxForTextRanges(imagePath, pending.map((p) => ({ lineIndex: p.lineIndex, utf16Start: p.utf16Start, utf16Length: p.utf16Length })));
|
|
202
|
+
pending.forEach((p, i) => boxes.set(p.key, rangeBoxes[i]));
|
|
203
|
+
}
|
|
204
|
+
if (issues.length > 0)
|
|
205
|
+
return { ok: false, issues };
|
|
206
|
+
return { ok: true, boxes, lines };
|
|
93
207
|
}
|
|
94
208
|
/**
|
|
95
209
|
* 自動配置(arrow.fromの省略時・text.at/number.atの文字アンカー時)が重なりを避ける対象の領域。
|
|
@@ -122,30 +236,16 @@ function classifyBucket(input) {
|
|
|
122
236
|
* (Vision文字認識を使った場合は)認識できた他の文字列の枠を避けるよう、bucket 1→2→3→4の順に
|
|
123
237
|
* 処理する(classifyBucket参照)。出力順は入力の順序を保つ。
|
|
124
238
|
*/
|
|
125
|
-
export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer = swiftTextRecognizer, scale = 1) {
|
|
126
|
-
const
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
// 自動配置の重なり回避に使う「認識できた他の文字列の枠」。Visionを一度も呼んでいなければ
|
|
134
|
-
// (=この下書きに文字アンカーが1つも無ければ)空のまま——自動配置のためだけに新たにOCRを
|
|
135
|
-
// 走らせて速度NFRを損なうことはしない(他の理由で既に呼んでいればその結果を再利用する)。
|
|
136
|
-
const ocrLineBoxes = () => (lines ?? []).map((l) => l.box);
|
|
239
|
+
export async function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer = swiftTextRecognizer, scale = 1) {
|
|
240
|
+
const pre = await resolveTextAnchorBoxes(imagePath, inputs, recognizer);
|
|
241
|
+
if (!pre.ok)
|
|
242
|
+
return { ok: false, issues: pre.issues };
|
|
243
|
+
const { boxes, lines } = pre;
|
|
244
|
+
// 自動配置の重なり回避に使う「認識できた他の文字列の枠」。文字アンカーが1つも無ければ
|
|
245
|
+
// (resolveTextAnchorBoxesがVisionを呼んでいない)空のまま。
|
|
246
|
+
const ocrLineBoxes = lines.map((l) => l.box);
|
|
137
247
|
const resolvedByIndex = new Array(inputs.length);
|
|
138
248
|
const occupied = [];
|
|
139
|
-
const reportFailure = (annotationIndex, field, anchor, result) => {
|
|
140
|
-
issues.push({
|
|
141
|
-
annotationIndex,
|
|
142
|
-
field,
|
|
143
|
-
query: anchor.text,
|
|
144
|
-
occurrence: anchor.occurrence,
|
|
145
|
-
status: result.status,
|
|
146
|
-
candidates: result.candidates,
|
|
147
|
-
});
|
|
148
|
-
};
|
|
149
249
|
for (const bucket of [1, 2, 3, 4]) {
|
|
150
250
|
inputs.forEach((input, annotationIndex) => {
|
|
151
251
|
if (classifyBucket(input) !== bucket)
|
|
@@ -155,12 +255,7 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
155
255
|
let toBox;
|
|
156
256
|
let toPoint;
|
|
157
257
|
if (isTextAnchorPoint(input.to)) {
|
|
158
|
-
|
|
159
|
-
if ("issue" in r) {
|
|
160
|
-
reportFailure(annotationIndex, "arrow.to", input.to, r.issue);
|
|
161
|
-
return;
|
|
162
|
-
}
|
|
163
|
-
toBox = r.box;
|
|
258
|
+
toBox = boxes.get(queryKey(annotationIndex, "arrow.to"));
|
|
164
259
|
}
|
|
165
260
|
else {
|
|
166
261
|
toPoint = input.to;
|
|
@@ -168,18 +263,15 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
168
263
|
let fromPoint;
|
|
169
264
|
if (input.from !== undefined) {
|
|
170
265
|
if (isTextAnchorPoint(input.from)) {
|
|
171
|
-
const
|
|
172
|
-
if (
|
|
173
|
-
|
|
174
|
-
return;
|
|
175
|
-
}
|
|
176
|
-
fromPoint = boxCenter(r.box);
|
|
266
|
+
const fromBox = boxes.get(queryKey(annotationIndex, "arrow.from"));
|
|
267
|
+
if (fromBox)
|
|
268
|
+
fromPoint = boxCenter(fromBox);
|
|
177
269
|
}
|
|
178
270
|
else {
|
|
179
271
|
fromPoint = input.from;
|
|
180
272
|
}
|
|
181
273
|
}
|
|
182
|
-
const avoid = [...occupied, ...ocrLineBoxes
|
|
274
|
+
const avoid = [...occupied, ...ocrLineBoxes];
|
|
183
275
|
if (toBox) {
|
|
184
276
|
const reference = fromPoint ?? defaultFromPoint(toBox, bounds, avoid, scale);
|
|
185
277
|
toPoint = dockPointOnBox(toBox, reference, scale);
|
|
@@ -199,12 +291,8 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
199
291
|
let at;
|
|
200
292
|
const footprintSize = estimateTextFootprintSize(input.text, input.width, scale);
|
|
201
293
|
if (isTextAnchorPoint(input.at)) {
|
|
202
|
-
const
|
|
203
|
-
|
|
204
|
-
reportFailure(annotationIndex, "text.at", input.at, r.issue);
|
|
205
|
-
return;
|
|
206
|
-
}
|
|
207
|
-
at = defaultLabelPoint(r.box, bounds, footprintSize, "topLeft", [...occupied, ...ocrLineBoxes()], scale);
|
|
294
|
+
const box = boxes.get(queryKey(annotationIndex, "text.at"));
|
|
295
|
+
at = defaultLabelPoint(box, bounds, footprintSize, "topLeft", [...occupied, ...ocrLineBoxes], scale);
|
|
208
296
|
}
|
|
209
297
|
else {
|
|
210
298
|
at = input.at;
|
|
@@ -217,12 +305,8 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
217
305
|
let at;
|
|
218
306
|
const stampSize = NUMBER_STAMP_DIAMETER_PX * scale;
|
|
219
307
|
if (isTextAnchorPoint(input.at)) {
|
|
220
|
-
const
|
|
221
|
-
|
|
222
|
-
reportFailure(annotationIndex, "number.at", input.at, r.issue);
|
|
223
|
-
return;
|
|
224
|
-
}
|
|
225
|
-
at = defaultLabelPoint(r.box, bounds, { w: stampSize, h: stampSize }, "center", [...occupied, ...ocrLineBoxes()], scale);
|
|
308
|
+
const box = boxes.get(queryKey(annotationIndex, "number.at"));
|
|
309
|
+
at = defaultLabelPoint(box, bounds, { w: stampSize, h: stampSize }, "center", [...occupied, ...ocrLineBoxes], scale);
|
|
226
310
|
}
|
|
227
311
|
else {
|
|
228
312
|
at = input.at;
|
|
@@ -235,26 +319,10 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
235
319
|
case "ellipse":
|
|
236
320
|
case "mosaic": {
|
|
237
321
|
const hasText = input.text !== undefined;
|
|
238
|
-
const hasCoords = input.x !== undefined && input.y !== undefined && input.w !== undefined && input.h !== undefined;
|
|
239
|
-
if (hasText === hasCoords) {
|
|
240
|
-
issues.push({
|
|
241
|
-
annotationIndex,
|
|
242
|
-
field: `${input.type}.region`,
|
|
243
|
-
query: input.text ?? "",
|
|
244
|
-
status: "no_match",
|
|
245
|
-
candidates: [],
|
|
246
|
-
});
|
|
247
|
-
return;
|
|
248
|
-
}
|
|
249
322
|
let region;
|
|
250
323
|
if (hasText) {
|
|
251
|
-
const
|
|
252
|
-
|
|
253
|
-
if ("issue" in r) {
|
|
254
|
-
reportFailure(annotationIndex, `${input.type}.region`, anchor, r.issue);
|
|
255
|
-
return;
|
|
256
|
-
}
|
|
257
|
-
region = expandBoxWithMargin(r.box, input.margin ?? DEFAULT_REGION_MARGIN_PX);
|
|
324
|
+
const box = boxes.get(queryKey(annotationIndex, `${input.type}.region`));
|
|
325
|
+
region = expandBoxWithMargin(box, input.margin ?? DEFAULT_REGION_MARGIN_PX);
|
|
258
326
|
}
|
|
259
327
|
else {
|
|
260
328
|
region = { x: input.x, y: input.y, w: input.w, h: input.h };
|
|
@@ -271,8 +339,6 @@ export function resolveAnnotationAnchors(imagePath, inputs, bounds, recognizer =
|
|
|
271
339
|
}
|
|
272
340
|
});
|
|
273
341
|
}
|
|
274
|
-
if (issues.length > 0)
|
|
275
|
-
return { ok: false, issues };
|
|
276
342
|
return { ok: true, annotations: resolvedByIndex };
|
|
277
343
|
}
|
|
278
344
|
//# sourceMappingURL=agentAnnotations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentAnnotations.js","sourceRoot":"","sources":["../../src/agentAnnotations.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agentAnnotations.js","sourceRoot":"","sources":["../../src/agentAnnotations.ts"],"names":[],"mappings":"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"}
|
package/dist/src/capture.js
CHANGED
|
@@ -77,8 +77,8 @@ export function captureScreen() {
|
|
|
77
77
|
return { status: "captured", meta: readCaptureMeta(path) };
|
|
78
78
|
}
|
|
79
79
|
/** mode: "window"(アプリ名/タイトルの部分一致で1件に絞れたときだけ撮る) */
|
|
80
|
-
export function captureWindowByMatch(app, title) {
|
|
81
|
-
const all = listWindows();
|
|
80
|
+
export async function captureWindowByMatch(app, title) {
|
|
81
|
+
const all = await listWindows();
|
|
82
82
|
const matches = findWindows(all, app, title);
|
|
83
83
|
if (matches.length === 0) {
|
|
84
84
|
return { status: "no_match", candidates: all };
|
package/dist/src/capture.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../src/capture.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../src/capture.ts"],"names":[],"mappings":"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"}
|
package/dist/src/draft.js
CHANGED
|
@@ -9,8 +9,15 @@
|
|
|
9
9
|
// 3. 解決済みの注釈(従来のAnnotationInput)を doc 座標へ変換し、AnnotationArchive 封筒 +
|
|
10
10
|
// 目印キーのJSONを作る
|
|
11
11
|
// 4. ベース画像(注釈は焼かない)のバイト列へ、そのJSONをiTXt "Comment"として埋め込み、outputPathへ書く
|
|
12
|
-
// 5.
|
|
13
|
-
//
|
|
12
|
+
// 5. FletchShotを開く(0.1.7改訂)。同じバンドルID(app.fletchshot.FletchShot)のアプリがMac上に
|
|
13
|
+
// 複数存在する環境(/Applicationsの旧版・Xcode DerivedData・build/配下のデバッグビルド等)では、
|
|
14
|
+
// `open -b`(バンドルID解決)だと起動中のものではない別のバンドルに渡ってしまい、下書きが開かない
|
|
15
|
+
// 不具合が実機で確認された。そこで先に`lsappinfo`で「起動中」のFletchShotのバンドルパスを
|
|
16
|
+
// 調べ(findRunningBundlePath)、見つかれば`open -a <そのパス>`で開く。見つからなければ
|
|
17
|
+
// (起動していない等)従来どおり`open -b`にフォールバックする。
|
|
18
|
+
// また、起動中のバンドルのInfo.plistからCFBundleShortVersionStringを読み(readBundleShortVersion)、
|
|
19
|
+
// 下書き(「エージェントに返す」ボタン)に対応する2.4.0未満なら呼び出し側へ注意文を渡せるようにする
|
|
20
|
+
// (開くこと自体は止めない。`open -b`フォールバック時はバージョン不明のため注意は付けない)。
|
|
14
21
|
import { spawnSync } from "node:child_process";
|
|
15
22
|
import { dirname, extname, join, basename } from "node:path";
|
|
16
23
|
import { readFileSync, writeFileSync } from "node:fs";
|
|
@@ -19,6 +26,90 @@ import { buildDraftCommentJson } from "./annotations.js";
|
|
|
19
26
|
import { resolveAnnotationAnchors } from "./agentAnnotations.js";
|
|
20
27
|
import { swiftTextRecognizer } from "./vision.js";
|
|
21
28
|
export const FLETCHSHOT_BUNDLE_ID = "app.fletchshot.FletchShot";
|
|
29
|
+
/** 下書き(「エージェントに返す」ボタン)に対応する最低バージョン。これ未満が起動中なら注意文を付ける。 */
|
|
30
|
+
export const DRAFT_MIN_SUPPORTED_VERSION = "2.4.0";
|
|
31
|
+
const LSAPPINFO_TIMEOUT_MS = 3_000;
|
|
32
|
+
const PLUTIL_TIMEOUT_MS = 3_000;
|
|
33
|
+
const OPEN_TIMEOUT_MS = 15_000;
|
|
34
|
+
export const defaultCommandRunner = (command, args, timeoutMs) => {
|
|
35
|
+
const result = spawnSync(command, args, { encoding: "utf8", timeout: timeoutMs });
|
|
36
|
+
const errorCode = result.error?.code;
|
|
37
|
+
return {
|
|
38
|
+
// timeout等で result.error が立つ場合はstatusが未確定なので失敗(null)として扱う
|
|
39
|
+
status: errorCode ? null : result.status,
|
|
40
|
+
stdout: result.stdout ?? "",
|
|
41
|
+
stderr: result.stderr || (errorCode ? `error.code=${errorCode}` : ""),
|
|
42
|
+
};
|
|
43
|
+
};
|
|
44
|
+
/**
|
|
45
|
+
* `lsappinfo find bundleid=...` の出力からASNトークン(例: `ASN:0x0-0xbf0bf0-"FletchShot":`)を
|
|
46
|
+
* 取り出す純粋関数。見つからない(起動していない)ときは空文字列が返ってくるのでundefined。
|
|
47
|
+
*/
|
|
48
|
+
export function parseAsnFromFindOutput(stdout) {
|
|
49
|
+
const trimmed = stdout.trim();
|
|
50
|
+
return trimmed.length > 0 ? trimmed : undefined;
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* `lsappinfo info -only bundlepath <ASN>` の出力(`bundle path="..."`を含む複数行)から
|
|
54
|
+
* バンドルパスを取り出す純粋関数。見つからなければundefined。
|
|
55
|
+
*/
|
|
56
|
+
export function parseBundlePathFromInfoOutput(stdout) {
|
|
57
|
+
const m = stdout.match(/bundle path="([^"]+)"/);
|
|
58
|
+
return m ? m[1] : undefined;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* 起動中のbundleIdのアプリの「実際に起動しているバンドル」のパスを調べる
|
|
62
|
+
* (`lsappinfo find bundleid=...` → ASNトークン → `lsappinfo info -only bundlepath <ASN>`の2段)。
|
|
63
|
+
* 起動していない・lsappinfoが使えない等はすべてundefined(呼び出し側は`open -b`へフォールバックする)。
|
|
64
|
+
*/
|
|
65
|
+
export function findRunningBundlePath(bundleId, runner = defaultCommandRunner, timeoutMs = LSAPPINFO_TIMEOUT_MS) {
|
|
66
|
+
const findResult = runner("lsappinfo", ["find", `bundleid=${bundleId}`], timeoutMs);
|
|
67
|
+
if (findResult.status !== 0)
|
|
68
|
+
return undefined;
|
|
69
|
+
const asn = parseAsnFromFindOutput(findResult.stdout);
|
|
70
|
+
if (!asn)
|
|
71
|
+
return undefined;
|
|
72
|
+
const infoResult = runner("lsappinfo", ["info", "-only", "bundlepath", asn], timeoutMs);
|
|
73
|
+
if (infoResult.status !== 0)
|
|
74
|
+
return undefined;
|
|
75
|
+
return parseBundlePathFromInfoOutput(infoResult.stdout);
|
|
76
|
+
}
|
|
77
|
+
/** `plutil -extract ... raw -o -`の出力(バージョン文字列1行)をトリムするだけの純粋関数。 */
|
|
78
|
+
export function parseShortVersion(stdout) {
|
|
79
|
+
const trimmed = stdout.trim();
|
|
80
|
+
return trimmed.length > 0 ? trimmed : undefined;
|
|
81
|
+
}
|
|
82
|
+
/** bundlePath(.appディレクトリ)のInfo.plistからCFBundleShortVersionStringを読む。失敗時はundefined。 */
|
|
83
|
+
export function readBundleShortVersion(bundlePath, runner = defaultCommandRunner, timeoutMs = PLUTIL_TIMEOUT_MS) {
|
|
84
|
+
const plistPath = join(bundlePath, "Contents", "Info.plist");
|
|
85
|
+
const result = runner("plutil", ["-extract", "CFBundleShortVersionString", "raw", "-o", "-", plistPath], timeoutMs);
|
|
86
|
+
if (result.status !== 0)
|
|
87
|
+
return undefined;
|
|
88
|
+
return parseShortVersion(result.stdout);
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* ドット区切りの数値バージョン同士を比較する純粋関数(例: "2.4.1" vs "2.4.0")。
|
|
92
|
+
* aがbより大きければ正、小さければ負、等しければ0。どちらかが数値のドット区切りとして
|
|
93
|
+
* パースできない場合はundefined(判定不能。呼び出し側は注意文を出さない)。
|
|
94
|
+
*/
|
|
95
|
+
export function compareVersions(a, b) {
|
|
96
|
+
const pa = a.split(".").map(Number);
|
|
97
|
+
const pb = b.split(".").map(Number);
|
|
98
|
+
if (pa.some((n) => Number.isNaN(n)) || pb.some((n) => Number.isNaN(n)))
|
|
99
|
+
return undefined;
|
|
100
|
+
const len = Math.max(pa.length, pb.length);
|
|
101
|
+
for (let i = 0; i < len; i++) {
|
|
102
|
+
const diff = (pa[i] ?? 0) - (pb[i] ?? 0);
|
|
103
|
+
if (diff !== 0)
|
|
104
|
+
return diff;
|
|
105
|
+
}
|
|
106
|
+
return 0;
|
|
107
|
+
}
|
|
108
|
+
/** version が min 以上かどうか。パース不能ならundefined(判定不能)。 */
|
|
109
|
+
export function isVersionAtLeast(version, min) {
|
|
110
|
+
const cmp = compareVersions(version, min);
|
|
111
|
+
return cmp === undefined ? undefined : cmp >= 0;
|
|
112
|
+
}
|
|
22
113
|
export function defaultDraftPath(imagePath) {
|
|
23
114
|
const dir = dirname(imagePath);
|
|
24
115
|
const ext = extname(imagePath) || ".png";
|
|
@@ -36,9 +127,9 @@ export function readImageGeometry(imagePath) {
|
|
|
36
127
|
* 下書きPNGを作って書き出す(openは呼ばない。テストしやすいよう分離)。
|
|
37
128
|
* recognizerは文字アンカー解決に使うVision呼び出しの差し替え口(テスト用。既定はswiftTextRecognizer)。
|
|
38
129
|
*/
|
|
39
|
-
export function writeDraft(imagePath, annotations, outputPath, recognizer = swiftTextRecognizer) {
|
|
130
|
+
export async function writeDraft(imagePath, annotations, outputPath, recognizer = swiftTextRecognizer) {
|
|
40
131
|
const { geo, widthPx, buf } = readImageGeometry(imagePath);
|
|
41
|
-
const resolution = resolveAnnotationAnchors(imagePath, annotations, { width: widthPx, height: geo.heightPx }, recognizer, geo.scale);
|
|
132
|
+
const resolution = await resolveAnnotationAnchors(imagePath, annotations, { width: widthPx, height: geo.heightPx }, recognizer, geo.scale);
|
|
42
133
|
if (!resolution.ok) {
|
|
43
134
|
return { status: "anchor_error", issues: resolution.issues };
|
|
44
135
|
}
|
|
@@ -55,15 +146,34 @@ export function writeDraft(imagePath, annotations, outputPath, recognizer = swif
|
|
|
55
146
|
annotationCount: annotations.length,
|
|
56
147
|
};
|
|
57
148
|
}
|
|
58
|
-
/**
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
149
|
+
/**
|
|
150
|
+
* FletchShotを開く。起動中のFletchShotのバンドルパスが分かれば`open -a <そのパス>`で開き
|
|
151
|
+
* (同バンドルIDの複数インストールがあっても起動中のものに確実に届く)、分からなければ
|
|
152
|
+
* 従来どおり`open -b`(バンドルID解決)にフォールバックする。失敗しても例外は投げず結果を返す
|
|
153
|
+
* (呼び出し側がメッセージ化)。
|
|
154
|
+
*/
|
|
155
|
+
export function openInFletchShot(path, runner = defaultCommandRunner) {
|
|
156
|
+
const runningBundlePath = findRunningBundlePath(FLETCHSHOT_BUNDLE_ID, runner);
|
|
157
|
+
let versionWarning;
|
|
158
|
+
let result;
|
|
159
|
+
if (runningBundlePath) {
|
|
160
|
+
const version = readBundleShortVersion(runningBundlePath, runner);
|
|
161
|
+
if (version !== undefined && isVersionAtLeast(version, DRAFT_MIN_SUPPORTED_VERSION) === false) {
|
|
162
|
+
versionWarning =
|
|
163
|
+
`起動中のFletchShotは${version}。下書き(返すボタン)は${DRAFT_MIN_SUPPORTED_VERSION}以降が必要です。`;
|
|
164
|
+
}
|
|
165
|
+
result = runner("open", ["-a", runningBundlePath, path], OPEN_TIMEOUT_MS);
|
|
166
|
+
// 起動中のバンドルへの`open -a`が失敗したとき(直前に終了した等)は、従来の`open -b`でもう一度試す
|
|
167
|
+
if (result.status !== 0) {
|
|
168
|
+
result = runner("open", ["-b", FLETCHSHOT_BUNDLE_ID, path], OPEN_TIMEOUT_MS);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
result = runner("open", ["-b", FLETCHSHOT_BUNDLE_ID, path], OPEN_TIMEOUT_MS);
|
|
173
|
+
}
|
|
64
174
|
if (result.status !== 0) {
|
|
65
|
-
return { ok: false, stderr: result.stderr || `open終了コード ${result.status}
|
|
175
|
+
return { ok: false, stderr: result.stderr || `open終了コード ${result.status}`, versionWarning };
|
|
66
176
|
}
|
|
67
|
-
return { ok: true };
|
|
177
|
+
return { ok: true, versionWarning };
|
|
68
178
|
}
|
|
69
179
|
//# sourceMappingURL=draft.js.map
|
package/dist/src/draft.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"draft.js","sourceRoot":"","sources":["../../src/draft.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,EAAE;AACF,8EAA8E;AAC9E,gCAAgC;AAChC,4CAA4C;AAC5C,wDAAwD;AACxD,+DAA+D;AAC/D,2BAA2B;AAC3B,qEAAqE;AACrE,mBAAmB;AACnB,sEAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"draft.js","sourceRoot":"","sources":["../../src/draft.ts"],"names":[],"mappings":"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"}
|