pencil-team 0.2.0 → 0.2.1

package/dist/index.js

@@ -9276,7 +9276,6 @@ class PenSync {
   }
   loadLocalFile() {
     if (!fs3.existsSync(this.options.filePath)) {
-      fs3.writeFileSync(this.options.filePath, "{}");
       return;
     }
     try {
@@ -9444,14 +9443,16 @@ class PenSync {
 // src/platform/opener.ts
 import { execSync, spawn } from "child_process";
 import path3 from "path";
+var pencilPid = null;
 async function openWithPencil(filePath) {
   const absPath = path3.resolve(filePath);
+  const pidsBefore = getPencilPids();
   switch (process.platform) {
     case "darwin":
       try {
-        spawn("open", ["-a", "Pencil", absPath], { stdio: "ignore", detached: true }).unref();
+        execSync(`open -a "Pencil" "${absPath}"`, { stdio: "ignore" });
       } catch {
-        spawn("open", [absPath], { stdio: "ignore", detached: true }).unref();
+        execSync(`open "${absPath}"`, { stdio: "ignore" });
       }
       break;
     case "linux":
@@ -9463,36 +9464,45 @@ async function openWithPencil(filePath) {
     default:
       throw new Error(`Unsupported platform: ${process.platform}`);
   }
+  await new Promise((r) => setTimeout(r, 2000));
+  const pidsAfter = getPencilPids();
+  const newPids = pidsAfter.filter((p) => !pidsBefore.includes(p));
+  if (newPids.length > 0) {
+    pencilPid = newPids[0];
+  }
 }
-function closePencil(filePath) {
-  const fileName = path3.basename(path3.resolve(filePath));
+function getPencilPids() {
   try {
     switch (process.platform) {
-      case "darwin": {
-        const script = `
-          tell application "System Events"
-            if exists (process "Pencil") then
-              tell process "Pencil"
-                repeat with w in windows
-                  if name of w contains "${fileName}" then
-                    click button 1 of w
-                  end if
-                end repeat
-              end tell
-            end if
-          end tell
-        `;
-        execSync(`osascript -e '${script.replace(/'/g, "'\\''")}'`, { stdio: "ignore", timeout: 5000 });
-        break;
+      case "darwin":
+      case "linux": {
+        const out = execSync("pgrep -fi pencil 2>/dev/null || true", { encoding: "utf-8" });
+        return out.trim().split(`
+`).filter(Boolean).map(Number).filter((n) => !isNaN(n));
+      }
+      case "win32": {
+        const out = execSync('tasklist /FI "IMAGENAME eq Pencil.exe" /FO CSV /NH 2>nul || echo ""', { encoding: "utf-8" });
+        return [...out.matchAll(/"Pencil\.exe","(\d+)"/g)].map((m) => Number(m[1]));
       }
+    }
+  } catch {}
+  return [];
+}
+function closePencil() {
+  if (!pencilPid)
+    return;
+  try {
+    switch (process.platform) {
+      case "darwin":
       case "linux":
-        execSync(`wmctrl -c "${fileName}"`, { stdio: "ignore", timeout: 5000 });
+        process.kill(pencilPid, "SIGTERM");
         break;
       case "win32":
-        execSync(`powershell -Command "Get-Process | Where-Object {$_.MainWindowTitle -like '*${fileName}*'} | ForEach-Object {$_.CloseMainWindow()}"`, { stdio: "ignore", timeout: 5000 });
+        execSync(`taskkill /PID ${pencilPid} /F`, { stdio: "ignore", timeout: 5000 });
         break;
     }
   } catch {}
+  pencilPid = null;
 }
 
 // src/index.ts
@@ -9565,7 +9575,10 @@ program2.command("sync").description("Sync and open a .pen file from a room").ar
   }
   const filePath = getTempPenPath(room);
   if (!fs4.existsSync(filePath)) {
-    fs4.writeFileSync(filePath, "{}");
+    fs4.writeFileSync(filePath, JSON.stringify({
+      version: "1.0",
+      children: []
+    }, null, 2));
   }
   console.log(`Syncing room: ${room}`);
   console.log(`Local file: ${filePath}`);
@@ -9591,7 +9604,7 @@ program2.command("sync").description("Sync and open a .pen file from a room").ar
 Shutting down...`);
     sync.disconnect();
     console.log("Closing Pencil...");
-    closePencil(filePath);
+    closePencil();
     try {
       if (fs4.existsSync(filePath)) {
         fs4.unlinkSync(filePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pencil-team",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "bin": {
     "pencil-team": "dist/index.js"