npm - jishushell - Versions diffs - 0.6.18 → 0.7.3 - Mend

jishushell 0.6.18 → 0.7.3

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.

Files changed (343) hide show

package/dist/services/files/photos/upload-page.js ADDED Viewed

@@ -0,0 +1,248 @@
+export function renderPhotoUploadPage(session) {
+    const sessionJson = scriptJson({
+        id: session.id,
+        status: session.status,
+        folderName: session.folderName ?? "",
+        expiresAt: session.expiresAt,
+        fileCount: session.fileCount,
+        totalBytes: session.totalBytes,
+        uploadedPaths: session.uploadedPaths,
+        finalizedBatchCount: session.finalizedBatchCount,
+        finalLibraryRelativePath: session.finalLibraryRelativePath ?? "",
+    });
+    return `<!doctype html>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title>上传照片到 AI Box</title>
+<style>
+:root{color-scheme:light dark;--bg:#f4f7f6;--panel:#fff;--panel2:#edf3f1;--text:#15201d;--muted:#65736f;--line:#d5dfdc;--accent:#087f6a;--accentText:#fff;--danger:#b42318}
+@media(prefers-color-scheme:dark){:root{--bg:#101513;--panel:#171e1b;--panel2:#202a26;--text:#edf5f2;--muted:#9badA7;--line:#31403b;--accent:#2dd4a8;--accentText:#06251c;--danger:#ff8a7a}}
+*{box-sizing:border-box}body{margin:0;background:var(--bg);color:var(--text);font:14px/1.5 system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif}
+main{width:min(900px,100%);margin:0 auto;padding:28px 16px 48px}h1{font-size:25px;margin:0 0 6px}.lead{margin:0 0 22px;color:var(--muted)}
+.drop{padding:38px 20px;border:2px dashed var(--line);border-radius:14px;background:var(--panel);text-align:center;transition:.15s}.drop.drag{border-color:var(--accent);background:var(--panel2)}
+.drop h2{margin:0 0 8px;font-size:18px}.drop p{margin:0;color:var(--muted)}.buttons{display:flex;flex-wrap:wrap;justify-content:center;gap:10px;margin-top:20px}
+button{min-height:42px;border:1px solid var(--line);border-radius:8px;padding:9px 15px;background:var(--panel);color:var(--text);font:inherit;font-weight:650;cursor:pointer}button:hover{border-color:var(--accent)}button:disabled{cursor:not-allowed;opacity:.55}
+button.primary{background:var(--accent);border-color:var(--accent);color:var(--accentText)}input[type=file]{position:absolute;width:1px;height:1px;opacity:0;pointer-events:none}
+.panel{margin-top:18px;border:1px solid var(--line);border-radius:12px;background:var(--panel);overflow:hidden}.panel-head{display:flex;justify-content:space-between;gap:12px;align-items:center;padding:14px 16px;border-bottom:1px solid var(--line)}
+.panel-head strong{font-size:15px}.summary{color:var(--muted)}.files{max-height:320px;overflow:auto}.file{display:grid;grid-template-columns:minmax(0,1fr) auto;gap:12px;padding:9px 16px;border-bottom:1px solid var(--line)}.file:last-child{border-bottom:0}.file-name{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.file-size{color:var(--muted)}
+.progress{height:8px;margin:14px 16px 0;border-radius:999px;background:var(--panel2);overflow:hidden}.progress>div{height:100%;width:0;background:var(--accent);transition:width .15s}.actions{display:flex;justify-content:flex-end;gap:10px;padding:16px}
+.status{margin-top:18px;padding:13px 15px;border-radius:10px;background:var(--panel2)}.status.error{color:var(--danger)}.status.success{color:var(--accent)}.status[hidden]{display:none}
+.small{margin-top:14px;color:var(--muted);font-size:12px}
+@media(max-width:560px){main{padding-top:20px}.drop{padding:28px 14px}.buttons,.actions{display:grid}.buttons button,.actions button{width:100%}.panel-head{display:block}.summary{margin-top:4px}.file{padding-inline:12px}}
+</style>
+</head>
+<body>
+<main>
+  <h1>上传照片到 AI Box</h1>
+  <p class="lead">从电脑或手机选择照片和视频。文件只通过当前局域网传输到 AI Box。</p>
+  <section class="drop" data-drop>
+    <h2>把照片拖到这里</h2>
+    <p>也可以使用系统文件选择器</p>
+    <div class="buttons">
+      <button class="primary" type="button" data-pick-files>选择照片或视频</button>
+      <button type="button" data-pick-folder>选择文件夹</button>
+    </div>
+    <input type="file" multiple accept="image/*,video/*,.dng,.raw,.arw,.cr2,.cr3,.nef,.orf,.raf,.rw2" data-files>
+    <input type="file" multiple webkitdirectory directory data-folder>
+  </section>
+  <section class="panel" data-panel hidden>
+    <div class="panel-head">
+      <strong>待上传文件</strong>
+      <span class="summary" data-summary></span>
+    </div>
+    <div class="files" data-list></div>
+    <div class="progress"><div data-progress></div></div>
+    <div class="actions">
+      <button type="button" data-clear>清空</button>
+      <button class="primary" type="button" data-upload>开始上传</button>
+      <button class="primary" type="button" data-finalize hidden>完成并扫描照片库</button>
+    </div>
+  </section>
+  <div class="status" data-status hidden role="status"></div>
+  <p class="small">文件夹选择主要适用于桌面 Chrome、Edge 和 Safari。手机请使用“选择照片或视频”。链接将在 ${escapeHtml(session.expiresAt)} 过期。</p>
+</main>
+<script>
+const session=${sessionJson};
+const selected=new Map();
+const uploadedPaths=new Set(session.uploadedPaths||[]);
+const drop=document.querySelector("[data-drop]");
+const filesInput=document.querySelector("[data-files]");
+const folderInput=document.querySelector("[data-folder]");
+const panel=document.querySelector("[data-panel]");
+const list=document.querySelector("[data-list]");
+const summary=document.querySelector("[data-summary]");
+const progress=document.querySelector("[data-progress]");
+const statusBox=document.querySelector("[data-status]");
+const uploadButton=document.querySelector("[data-upload]");
+const finalizeButton=document.querySelector("[data-finalize]");
+const clearButton=document.querySelector("[data-clear]");
+let uploaded=false;
+let busy=false;
+function esc(value){return String(value).replace(/[&<>"']/g,(char)=>({"&":"&amp;","<":"&lt;",">":"&gt;","\\"":"&quot;","'":"&#39;"}[char]));}
+function formatBytes(value){if(value<1024)return value+" B";const units=["KB","MB","GB","TB"];let n=value/1024;let i=0;while(n>=1024&&i<units.length-1){n/=1024;i++;}return n.toFixed(n>=10?1:2)+" "+units[i];}
+function relativePath(file){return String(file.webkitRelativePath||file.name||"").replace(/\\\\/g,"/").replace(/^\\/+/, "");}
+function setStatus(kind,message){statusBox.hidden=!message;statusBox.className="status"+(kind?" "+kind:"");statusBox.textContent=message||"";}
+function addFiles(files){
+  if(busy||session.status==="finalized")return;
+  for(const file of files){
+    if(!(file instanceof File))continue;
+    const path=relativePath(file);
+    if(path&&!uploadedPaths.has(path))selected.set(path,file);
+  }
+  uploaded=false;
+  render();
+}
+function render(){
+  const entries=[...selected.entries()];
+  const total=entries.reduce((sum,item)=>sum+item[1].size,0);
+  panel.hidden=entries.length===0&&uploadedPaths.size===0&&!uploaded;
+  summary.textContent=entries.length+" 个待上传 · "+uploadedPaths.size+" 个已上传 · "+formatBytes(total);
+  list.innerHTML=entries.slice(0,300).map(([path,file])=>'<div class="file"><span class="file-name" title="'+esc(path)+'">'+esc(path)+'</span><span class="file-size">'+formatBytes(file.size)+'</span></div>').join("")+(entries.length>300?'<div class="file"><span>还有 '+(entries.length-300)+' 个文件</span></div>':"");
+  uploadButton.hidden=entries.length===0;
+  clearButton.hidden=entries.length===0;
+  uploadButton.disabled=busy||entries.length===0||uploaded;
+  clearButton.disabled=busy||uploaded;
+  finalizeButton.hidden=uploadedPaths.size===0||entries.length>0||session.status==="finalized";
+}
+async function uploadOne(path,file,onProgress){
+  return await new Promise((resolve,reject)=>{
+    const xhr=new XMLHttpRequest();
+    xhr.open("POST",window.location.pathname+"/files?path="+encodeURIComponent(path));
+    xhr.setRequestHeader("X-Jishushell-Photo-Upload","1");
+    xhr.upload.onprogress=(event)=>{if(event.lengthComputable)onProgress(event.loaded,event.total);};
+    xhr.onerror=()=>reject(new Error("网络错误"));
+    xhr.onload=()=>{
+      let body={};
+      try{body=xhr.responseText?JSON.parse(xhr.responseText):{};}catch(_){}
+      if(xhr.status>=200&&xhr.status<300)resolve(body);
+      else reject(new Error(body.error||body.detail||("上传失败（HTTP "+xhr.status+"）")));
+    };
+    const form=new FormData();
+    form.append("file",file,file.name);
+    xhr.send(form);
+  });
+}
+async function startUpload(){
+  if(busy||uploaded||selected.size===0)return;
+  busy=true;
+  setStatus("","正在上传，请不要关闭页面…");
+  render();
+  const entries=[...selected.entries()];
+  const totalBytes=entries.reduce((sum,item)=>sum+item[1].size,0);
+  let completedBytes=0;
+  try{
+    for(let index=0;index<entries.length;index++){
+      const [path,file]=entries[index];
+      setStatus("","正在上传 "+(index+1)+" / "+entries.length+"："+path);
+      await uploadOne(path,file,(loaded)=>{
+        const value=totalBytes?((completedBytes+loaded)/totalBytes)*100:0;
+        progress.style.width=Math.min(100,value)+"%";
+      });
+      completedBytes+=file.size;
+      uploadedPaths.add(path);
+      selected.delete(path);
+      progress.style.width=(totalBytes?(completedBytes/totalBytes)*100:100)+"%";
+    }
+    uploaded=true;
+    uploadButton.hidden=true;
+    finalizeButton.hidden=false;
+    setStatus("success","文件上传完成。点击“完成并扫描照片库”后，照片才会进入默认图库。");
+  }catch(error){
+    setStatus("error","上传中断："+(error&&error.message?error.message:String(error))+"。已成功上传的文件已经保留，可以直接重试剩余文件。");
+  }finally{
+    busy=false;
+    render();
+  }
+}
+async function finalize(){
+  if(busy||uploadedPaths.size===0||selected.size>0)return;
+  busy=true;
+  finalizeButton.disabled=true;
+  setStatus("","正在保存批次并提交 Immich 扫描…");
+  try{
+    const response=await fetch(window.location.pathname+"/finalize",{
+      method:"POST",
+      headers:{"Content-Type":"application/json","X-Jishushell-Photo-Upload":"1"},
+      body:"{}"
+    });
+    const body=await response.json().catch(()=>({}));
+    if(!response.ok)throw new Error(body.error||body.detail||("完成失败（HTTP "+response.status+"）"));
+    const scan=body.scan||{};
+    uploadedPaths.clear();
+    selected.clear();
+    uploaded=false;
+    session.fileCount=0;
+    session.totalBytes=0;
+    session.uploadedPaths=[];
+    session.finalizedBatchCount=body.batch_number||((session.finalizedBatchCount||0)+1);
+    session.finalLibraryRelativePath=body.library_path||session.finalLibraryRelativePath||"";
+    progress.style.width="0";
+    finalizeButton.textContent="完成并扫描照片库";
+    if(scan.status==="scan_queued"){
+      setStatus("success","已保存第 "+session.finalizedBatchCount+" 批 "+body.file_count+" 个文件，Immich 已开始后台扫描。可以继续选择下一批，或关闭此页面。");
+    }else{
+      setStatus("success","已保存第 "+session.finalizedBatchCount+" 批 "+body.file_count+" 个文件。自动扫描未完成；可以继续选择下一批，或回到 OpenClaw 说“扫描照片库”。");
+    }
+    busy=false;
+    finalizeButton.disabled=false;
+    render();
+  }catch(error){
+    busy=false;
+    finalizeButton.disabled=false;
+    setStatus("error","完成失败："+(error&&error.message?error.message:String(error))+"。文件仍安全保存在临时目录，可以重试。");
+    render();
+  }
+}
+document.querySelector("[data-pick-files]").addEventListener("click",()=>filesInput.click());
+document.querySelector("[data-pick-folder]").addEventListener("click",()=>folderInput.click());
+filesInput.addEventListener("change",()=>{addFiles(filesInput.files);filesInput.value="";});
+folderInput.addEventListener("change",()=>{addFiles(folderInput.files);folderInput.value="";});
+drop.addEventListener("dragover",(event)=>{event.preventDefault();drop.classList.add("drag");});
+drop.addEventListener("dragleave",()=>drop.classList.remove("drag"));
+drop.addEventListener("drop",(event)=>{event.preventDefault();drop.classList.remove("drag");addFiles(event.dataTransfer.files);});
+clearButton.addEventListener("click",()=>{selected.clear();progress.style.width="0";setStatus("","");render();});
+uploadButton.addEventListener("click",startUpload);
+finalizeButton.addEventListener("click",finalize);
+if(session.status==="finalized"){
+  uploaded=true;
+  panel.hidden=false;
+  uploadButton.hidden=true;
+  clearButton.hidden=true;
+  finalizeButton.hidden=false;
+  finalizeButton.disabled=true;
+  finalizeButton.textContent="已完成";
+  setStatus("success","这个上传批次已经保存到照片库。");
+}else if(uploadedPaths.size>0){
+  setStatus("","这个批次已有 "+uploadedPaths.size+" 个文件上传完成。可以继续选择文件，或直接完成并扫描。");
+}
+render();
+</script>
+</body>
+</html>`;
+}
+function escapeHtml(value) {
+    return value.replace(/[&<>"']/g, (char) => {
+        const escaped = {
+            "&": "&amp;",
+            "<": "&lt;",
+            ">": "&gt;",
+            "\"": "&quot;",
+            "'": "&#39;",
+        };
+        return escaped[char] ?? char;
+    });
+}
+function scriptJson(value) {
+    return JSON.stringify(value)
+        .replace(/</g, "\\u003c")
+        .replace(/>/g, "\\u003e")
+        .replace(/&/g, "\\u0026")
+        .replace(/\u2028/g, "\\u2028")
+        .replace(/\u2029/g, "\\u2029");
+}
+//# sourceMappingURL=upload-page.js.map

package/dist/services/files/photos/upload-page.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"upload-page.js","sourceRoot":"","sources":["../../../../src/services/files/photos/upload-page.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qBAAqB,CAAC,OAA2B;IAC/D,MAAM,WAAW,GAAG,UAAU,CAAC;QAC7B,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,EAAE;QACpC,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;QAChD,wBAAwB,EAAE,OAAO,CAAC,wBAAwB,IAAI,EAAE;KACjE,CAAC,CAAC;IAEH,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2EAsDkE,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC;;;gBAGxF,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4JnB,CAAC;AACT,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;QACxC,MAAM,OAAO,GAA2B;YACtC,GAAG,EAAE,OAAO;YACZ,GAAG,EAAE,MAAM;YACX,GAAG,EAAE,MAAM;YACX,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,OAAO;SACb,CAAC;QACF,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;SACzB,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;SACxB,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;SACxB,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;SACxB,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC;SAC7B,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AACnC,CAAC"}

package/dist/services/files/photos/upload-store.d.ts ADDED Viewed

@@ -0,0 +1,74 @@
+import type { Readable } from "node:stream";
+export declare const PHOTO_UPLOAD_TTL_MS: number;
+export declare const PHOTO_UPLOAD_FINALIZED_RETENTION_MS: number;
+export declare const PHOTO_UPLOAD_MAX_FILES = 2000;
+export declare const PHOTO_UPLOAD_MAX_FILE_BYTES: number;
+export declare const PHOTO_UPLOAD_MAX_TOTAL_BYTES: number;
+export type PhotoUploadSession = {
+    id: string;
+    status: "open" | "finalized";
+    folderName?: string;
+    destinationRelativePath: string;
+    createdAt: string;
+    expiresAt: string;
+    fileCount: number;
+    totalBytes: number;
+    uploadedPaths: string[];
+    finalizedBatchCount: number;
+    finalizedAt?: string;
+    finalLibraryRelativePath?: string;
+};
+export type PhotoUploadFinalizeResult = {
+    session: PhotoUploadSession;
+    fileCount: number;
+    totalBytes: number;
+    batchNumber: number;
+    libraryRelativePath: string;
+};
+export type CreatePhotoUploadSessionInput = {
+    folderName?: string;
+    now?: Date;
+    ttlMs?: number;
+};
+export type PhotoUploadStoreOptions = {
+    filesRoot?: string;
+    sessionRoot?: string;
+};
+export declare class PhotoUploadStore {
+    private readonly filesRoot;
+    private readonly sessionRoot;
+    private readonly photosRoot;
+    private readonly stagingRoot;
+    private readonly libraryRoot;
+    constructor(options?: PhotoUploadStoreOptions);
+    create(input?: CreatePhotoUploadSessionInput): PhotoUploadSession;
+    get(sessionId: string): PhotoUploadSession | null;
+    writeFile(sessionId: string, relativePathInput: string, source: Readable, options?: {
+        now?: Date;
+    }): Promise<{
+        path: string;
+        size: number;
+        fileCount: number;
+        totalBytes: number;
+    }>;
+    finalize(sessionId: string, options?: {
+        now?: Date;
+    }): Promise<PhotoUploadFinalizeResult>;
+    deleteExpired(options?: {
+        now?: Date;
+    }): number;
+    private requireOpenSession;
+    private withSessionLock;
+    private writeSession;
+    private sessionDir;
+    private sessionPath;
+    private lockPath;
+    private stagingDir;
+    private clearInterruptedOperationLocks;
+}
+export declare class PhotoUploadError extends Error {
+    readonly statusCode: number;
+    readonly code: string;
+    constructor(message: string, statusCode: number, code: string);
+}
+export declare function photoUploadDisplayName(session: PhotoUploadSession): string;