excalidrop 0.1.2 → 0.1.4

package/src/utils/github.ts

@@ -1,16 +1,16 @@
-/** GitHub as source of truth. Scene = canvas.excalidraw on main; viewer copy on gh-pages. No Actions. */
+
 import logger from './logger.js';
 import { execSync } from 'node:child_process';
 
 const API = 'https://api.github.com';
-/** Zero-config: GITHUB_TOKEN env, else `gh auth token`, else '' (public reads still work). */
+
 export function token(): string {
   if (process.env.GITHUB_TOKEN) return process.env.GITHUB_TOKEN;
   try {
     return execSync('gh auth token', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
   } catch { return ''; }
 }
-/** Zero-config: current repo from git remote. Empty allowlist = current repo only. */
+
 export function currentRepo(): string {
   try {
     const url = execSync('git config --get remote.origin.url', { encoding: 'utf8' }).trim();
@@ -20,22 +20,22 @@ export function currentRepo(): string {
 }
 export const SCENE_PATH = process.env.SCENE_PATH || 'canvas.excalidraw';
 
+export const CANVAS_BRANCH = process.env.CANVAS_BRANCH || 'excalidrop';
+
 export function allowedRepos(): string[] {
   const list = (process.env.ALLOWED_REPOS || '').split(',').map(s => s.trim().toLowerCase()).filter(Boolean);
   if (list.length) return list;
   const cur = currentRepo();
   return cur ? [cur] : [];
 }
-/** Legacy allowlist hook (hosted multi-tenant remote only). Local MCP paths do not
- *  gate on it: the user's own token + GitHub's API enforcement is the real
- *  gate, and any user must be able to work on any repo they can access. */
+
 export function assertRepo(_repo: string): void {
-  // intentionally no-op — see above
+
 }
 function headers(): Record<string, string> {
   return { Authorization: `Bearer ${token()}`, Accept: 'application/vnd.github+json', 'User-Agent': 'excalidrop', 'Content-Type': 'application/json' };
 }
-export async function getFile(repo: string, path: string, ref = 'main'): Promise<{ sha: string; content: any } | null> {
+export async function getFile(repo: string, path: string, ref = CANVAS_BRANCH): Promise<{ sha: string; content: any } | null> {
   assertRepo(repo);
   const r = await fetch(`${API}/repos/${repo}/contents/${path}?ref=${ref}`, { headers: headers() });
   if (r.status === 404) return null;
@@ -44,50 +44,78 @@ export async function getFile(repo: string, path: string, ref = 'main'): Promise
   const text = Buffer.from(j.content, 'base64').toString('utf8');
   return { sha: j.sha, content: JSON.parse(text) };
 }
-export async function putFile(repo: string, path: string, data: any, message: string, branch = 'main', sha?: string): Promise<string> {
+
+async function ensureBranch(repo: string, branch: string): Promise<void> {
+  const has = await fetch(`${API}/repos/${repo}/git/ref/heads/${branch}`, { headers: headers() });
+  if (has.ok) return;
+  const repoInfo = await (await fetch(`${API}/repos/${repo}`, { headers: headers() })).json() as any;
+  const from = repoInfo.default_branch || 'main';
+  const ref = await (await fetch(`${API}/repos/${repo}/git/ref/heads/${from}`, { headers: headers() })).json() as any;
+  if (!ref.object?.sha) throw new Error(`cannot create ${branch}: no ${from} branch`);
+  const mkRef = await fetch(`${API}/repos/${repo}/git/refs`, { method: 'POST', headers: headers(), body: JSON.stringify({ ref: `refs/heads/${branch}`, sha: ref.object.sha }) });
+  if (!mkRef.ok) throw new Error(`cannot create ${branch}: ${(await mkRef.text()).slice(0, 200)}`);
+}
+export async function putFile(repo: string, path: string, data: any, message: string, branch = CANVAS_BRANCH, sha?: string): Promise<string> {
   assertRepo(repo);
   if (!token()) throw new Error('GITHUB_TOKEN missing');
   const body: any = { message, content: Buffer.from(JSON.stringify(data, null, 2)).toString('base64'), branch };
   if (sha) body.sha = sha;
   let r = await fetch(`${API}/repos/${repo}/contents/${path}`, { method: 'PUT', headers: headers(), body: JSON.stringify(body) });
-  if (r.status === 404 && branch === 'main') {
-    // 404 on PUT usually means the branch doesn't exist yet (empty repo —
-    // GitHub says plain "Not Found", not "branch missing"). Fork main off
-    // gh-pages (or the default branch) then retry.
-    const branchExists = await fetch(`${API}/repos/${repo}/git/ref/heads/main`, { headers: headers() });
-    if (branchExists.ok) throw new Error(`GitHub put 404: ${await r.text()}`.slice(0, 200));
-    const repoInfo = await (await fetch(`${API}/repos/${repo}`, { headers: headers() })).json() as any;
-    const from = repoInfo.default_branch && repoInfo.default_branch !== 'main' ? repoInfo.default_branch : 'gh-pages';
-    const ref = await (await fetch(`${API}/repos/${repo}/git/ref/heads/${from}`, { headers: headers() })).json() as any;
-    if (!ref.object?.sha) throw new Error(`cannot bootstrap main: no ${from} branch`);
-    const mkRef = await fetch(`${API}/repos/${repo}/git/refs`, { method: 'POST', headers: headers(), body: JSON.stringify({ ref: 'refs/heads/main', sha: ref.object.sha }) });
-    if (!mkRef.ok) throw new Error(`cannot bootstrap main: ${(await mkRef.text()).slice(0, 200)}`);
-    // main bootstrapped from another branch may already contain the file — attach its sha
-    const existing = await (await fetch(`${API}/repos/${repo}/contents/${path}?ref=main`, { headers: headers() })).json() as any;
-    if (existing.sha) body.sha = existing.sha;
+  if (r.status === 404) {
+
+    await ensureBranch(repo, branch);
+    const existing = await getFile(repo, path, branch).catch(() => null);
+    if (existing?.sha) body.sha = existing.sha;
+    else delete body.sha;
     r = await fetch(`${API}/repos/${repo}/contents/${path}`, { method: 'PUT', headers: headers(), body: JSON.stringify(body) });
   }
   if (r.status === 409) throw new Error('CONFLICT: file changed upstream, refetch sha and retry');
+  if (r.status === 422 && !sha) {
+
+    const existing = await getFile(repo, path, branch).catch(() => null);
+    if (!existing?.sha) throw new Error(`GitHub put 422: ${(await r.text()).slice(0, 200)}`);
+    body.sha = existing.sha;
+    r = await fetch(`${API}/repos/${repo}/contents/${path}`, { method: 'PUT', headers: headers(), body: JSON.stringify(body) });
+    if (r.status === 409) throw new Error('CONFLICT: file changed upstream, refetch sha and retry');
+  }
   if (!r.ok) throw new Error(`GitHub put ${r.status}: ${await r.text()}`);
   const j = await r.json() as any;
   logger.info(`Committed ${path}@${branch} in ${repo}`);
   return j.content.sha;
 }
-/** Load scene with sha for optimistic concurrency. */
+
 export async function loadScene(repo: string): Promise<{ elements: any[]; files: any[]; sha: string | null }> {
   assertRepo(repo);
-  const f = await getFile(repo, SCENE_PATH, 'main').catch(() => null);
+  const f = await getFile(repo, SCENE_PATH, CANVAS_BRANCH).catch(() => null);
   if (!f) return { elements: [], files: [], sha: null };
   return { elements: f.content.elements || [], files: f.content.files || [], sha: f.sha };
 }
-/** Save scene to main (1 commit per batch). Returns new sha. */
+
 export async function saveScene(repo: string, elements: any[], files: any[], sha: string | null, msg: string): Promise<string> {
-  return putFile(repo, SCENE_PATH, { type: 'excalidraw', version: 2, source: 'excalidrop', elements, files: {} , _files: files }, msg, 'main', sha || undefined);
+  return putFile(repo, SCENE_PATH, { type: 'excalidraw', version: 2, source: 'excalidrop', elements, files: files || {} }, msg, CANVAS_BRANCH, sha || undefined);
+}
+
+export async function syncPages(_repo: string, _scene: any): Promise<void> {
+
+}
+
+export async function updateRepoMetadata(repo: string, updates: { description?: string; homepage?: string }): Promise<void> {
+  assertRepo(repo);
+  if (!token()) throw new Error('GITHUB_TOKEN missing');
+  const r = await fetch(`${API}/repos/${repo}`, { method: 'PATCH', headers: headers(), body: JSON.stringify(updates) });
+  if (!r.ok) throw new Error(`GitHub PATCH ${r.status}: ${await r.text()}`);
+  logger.info(`Updated metadata for ${repo}`);
 }
-/** Sync prebuilt viewer + scene copy straight to gh-pages branch (direct push via Contents API, no Actions). */
-export async function syncPages(repo: string, scene: any): Promise<void> {
+
+export async function ensureRepoMetadata(repo: string, homepage: string): Promise<void> {
   assertRepo(repo);
-  // scene copy (viewer reads same-branch file: instant, no raw cache)
-  const cur = await getFile(repo, SCENE_PATH, 'gh-pages').catch(() => null);
-  await putFile(repo, SCENE_PATH, scene, 'excalidrop: sync scene to gh-pages', 'gh-pages', cur?.sha);
+  if (!token()) throw new Error('GITHUB_TOKEN missing');
+  const r = await fetch(`${API}/repos/${repo}`, { headers: headers() });
+  if (!r.ok) throw new Error(`GitHub GET ${r.status}: ${await r.text()}`);
+  const data = await r.json() as any;
+  if (!data.description || data.description.trim() === '') {
+    await updateRepoMetadata(repo, { description: homepage, homepage });
+  } else if (!data.homepage || data.homepage.trim() === '') {
+    await updateRepoMetadata(repo, { homepage });
+  }
 }

package/src/utils/logger.ts

@@ -21,12 +21,12 @@ const logger: winston.Logger = winston.createLogger({
 
   transports: [
     new winston.transports.Console({
-      level: 'warn',                 // only warn+error to stderr
+      level: 'warn',
       stderrLevels: ['warn','error']
     }),
 
     new winston.transports.File({
-      filename: LOG_FILE_PATH,    // all levels to file
+      filename: LOG_FILE_PATH,
       level: 'debug'
     })
   ]

package/src/utils/r2store.ts

@@ -1,12 +1,6 @@
 import crypto from 'node:crypto';
 
-/**
- * Minimal S3-compatible R2 client over fetch with AWS SigV4.
- * Reads creds from env (GH Actions secrets):
- *  R2_ACCOUNT_ID, R2_ACCESS_KEY_ID, R2_SECRET_ACCESS_KEY, R2_BUCKET, R2_KEY_PREFIX
- *  CLOUDFLARER2TOKEN supported as "accountId:keyId:secret" or "keyId:secret" or raw secret
- *  (with R2_ACCOUNT_ID also set) for seamless setup.
- */
+
 export interface R2Config {
   accountId: string; keyId: string; secret: string; bucket: string; prefix: string; endpoint: string;
 }

package/vite.config.js

@@ -10,8 +10,6 @@ export default defineConfig({
     emptyOutDir: true,
     rollupOptions: {
       output: {
-        // Excalidraw's font subsetting worker looks for these files by their
-        // original (unhashed) names. Preserve them so the 404 doesn't break export.
         chunkFileNames: (chunkInfo) => {
           if (chunkInfo.name.startsWith('subset-')) {
             return 'assets/[name].js'

package/dist/frontend/assets/channel-BqCiG5n3.js

@@ -1 +0,0 @@
-import{U as a,C as n}from"./index-D-cr7jpJ.js";const t=(r,o)=>a.lang.round(n.parse(r)[o]);export{t as c};

package/dist/frontend/assets/clone-B6Jqcrku.js

@@ -1 +0,0 @@
-import{b as r}from"./union-CnQAJu0l.js";var e=4;function a(o){return r(o,e)}export{a as c};

package/dist/frontend/assets/flowDiagram-v2-96b9c2cf-CBjbm_oB.js

@@ -1 +0,0 @@
-import{f as o,p as e}from"./flowDb-956e92f1-BC3-CLkF.js";import{f as a,a as t}from"./styles-c10674c1-CPAG2_rr.js";import{t as i}from"./index-HkUXslJy.js";import"./index-D-cr7jpJ.js";import"./graph-CYOmcSYN.js";import"./layout-CCtkxrAf.js";import"./index-3862675e-DrvLhypC.js";import"./union-CnQAJu0l.js";import"./clone-B6Jqcrku.js";import"./zipObject-BeXj5PVd.js";import"./edges-e0da2a9e-DQBAvC8-.js";import"./createText-2e5e7dd3-DB_k52Pn.js";import"./index-DGmpr33w.js";import"./line-DvZfgg9P.js";import"./array-BKyUJesY.js";import"./path-CbwjOpE9.js";import"./channel-BqCiG5n3.js";import"./selectAll-DJwesbwT.js";const x={parser:e,db:o,renderer:t,styles:a,init:r=>{r.flowchart||(r.flowchart={}),r.flowchart.arrowMarkerAbsolute=r.arrowMarkerAbsolute,i({flowchart:{arrowMarkerAbsolute:r.arrowMarkerAbsolute}}),t.setConf(r.flowchart),o.clear(),o.setGen("gen-2")}};export{x as diagram};

package/dist/frontend/assets/flowDiagram-v2-ffc7f31a-CoQufPp2.js

@@ -1 +0,0 @@
-import{f as o,p as e}from"./flowDb-7c981674-BSZyyVBf.js";import{f as a,a as t}from"./styles-2ab5d517-CA8x9Nh5.js";import{G as i}from"./index-D-cr7jpJ.js";import"./graph-o42dOfI7.js";import"./layout-DW9Qf-At.js";import"./index-6079d271-BgVTRqg2.js";import"./union-CnQAJu0l.js";import"./clone-B6Jqcrku.js";import"./zipObject-BeXj5PVd.js";import"./edges-332bd1c7-CVvMtkTa.js";import"./createText-d213de94-D-G49giw.js";import"./index-DGmpr33w.js";import"./line-DvZfgg9P.js";import"./array-BKyUJesY.js";import"./path-CbwjOpE9.js";import"./channel-BqCiG5n3.js";import"./selectAll-DJwesbwT.js";const C={parser:e,db:o,renderer:t,styles:a,init:r=>{r.flowchart||(r.flowchart={}),r.flowchart.arrowMarkerAbsolute=r.arrowMarkerAbsolute,i({flowchart:{arrowMarkerAbsolute:r.arrowMarkerAbsolute}}),t.setConf(r.flowchart),o.clear(),o.setGen("gen-2")}};export{C as diagram};