@sinoia/hubdoc-tools 1.8.1 → 1.8.3

package/cli.js

@@ -732518,12 +732518,57 @@ var import_chalk26 = __toESM(require_source());
 
 // apps/cli/cli/fuse/hubdoc-fs.ts
 var import_fs_extra32 = __toESM(require_lib());
+var import_fs3 = require("fs");
 var import_os7 = __toESM(require("os"));
 var import_path34 = __toESM(require("path"));
 var import_crypto6 = __toESM(require("crypto"));
 var import_form_data5 = __toESM(require_form_data());
 var DIR_MODE = 16877;
 var FILE_MODE = 33188;
+var CHUNKED_THRESHOLD2 = 50 * 1024 * 1024;
+var MIME_BY_EXT = {
+  // Office 2007+
+  ".docx": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  ".xlsx": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  ".pptx": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  // Office legacy
+  ".doc": "application/msword",
+  ".xls": "application/vnd.ms-excel",
+  ".ppt": "application/vnd.ms-powerpoint",
+  // OpenDocument
+  ".odt": "application/vnd.oasis.opendocument.text",
+  ".ods": "application/vnd.oasis.opendocument.spreadsheet",
+  ".odp": "application/vnd.oasis.opendocument.presentation",
+  // PDF & text
+  ".pdf": "application/pdf",
+  ".txt": "text/plain",
+  ".md": "text/markdown",
+  ".csv": "text/csv",
+  ".json": "application/json",
+  ".xml": "application/xml",
+  ".html": "text/html",
+  // Images
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".svg": "image/svg+xml",
+  ".tiff": "image/tiff",
+  ".tif": "image/tiff",
+  ".heic": "image/heic",
+  // Archives
+  ".zip": "application/zip",
+  ".gz": "application/gzip",
+  ".tar": "application/x-tar",
+  ".7z": "application/x-7z-compressed"
+};
+function mimeForFile(name) {
+  return MIME_BY_EXT[import_path34.default.extname(name).toLowerCase()] || "application/octet-stream";
+}
+function isOfficeLockfile(name) {
+  return /^~\$/.test(name) || /^\.~lock\./.test(name) || /^Word Work File /.test(name);
+}
 var HubdocFs = class {
   constructor(ctx, root, opts = {}) {
     this.ctx = ctx;
@@ -732697,47 +732742,127 @@ var HubdocFs = class {
     node.downloaded = true;
     node.size = (await import_fs_extra32.default.stat(dest)).size;
   }
-  async uploadNew(node) {
+  /**
+   * Upload the local cache of `node` to Hubdoc — either as a new document
+   * (POST) or as a new version of an existing one (PATCH). Files above
+   * `CHUNKED_THRESHOLD` go through `ChunkedUploader` so large Excel/PPT
+   * workbooks don't stall the multipart POST.
+   */
+  async uploadNode(node, mode) {
+    if (node.localOnly) return;
     const local = this.cacheFileFor(node);
+    const size = (await import_fs_extra32.default.stat(local)).size;
+    const contentType2 = mimeForFile(node.name);
+    if (mode === "update" && !node.id) {
+      mode = "create";
+    }
+    if (mode === "create" && size >= CHUNKED_THRESHOLD2) {
+      const uploader = new ChunkedUploader2(this.ctx.baseUrl, this.ctx.token);
+      const result = await uploader.uploadFile({
+        filePath: local,
+        workspaceId: node.workspaceId,
+        folderId: node.folderId
+      });
+      if (!result.success) throw new Error(`Chunked upload failed: ${result.error || "unknown error"}`);
+      const form2 = new import_form_data5.default();
+      form2.append("chunked_upload_id", result.uploadId);
+      if (node.folderId) form2.append("documents_folder_id", node.folderId);
+      else if (node.workspaceId) form2.append("workspace_id", node.workspaceId);
+      const res = await this.ctx.axios.post("/api/v1/documents/documents", form2, {
+        headers: form2.getHeaders(),
+        maxBodyLength: Infinity,
+        maxContentLength: Infinity
+      });
+      const created = res.data?.document ?? res.data;
+      if (created?.id) node.id = created.id;
+      node.isNew = false;
+      node.size = size;
+      return;
+    }
     const form = new import_form_data5.default();
     form.append("uploaded_file", import_fs_extra32.default.createReadStream(local), {
       filename: node.name,
-      contentType: "application/octet-stream"
+      contentType: contentType2
     });
-    if (node.folderId) form.append("documents_folder_id", node.folderId);
-    else if (node.workspaceId) form.append("workspace_id", node.workspaceId);
-    if (node.name.toLowerCase().endsWith(".md")) {
-      this.log(`\u26A0\uFE0F  ${node.name}: write-back markdown \u2014 voir caveat collab #508`);
-    }
-    const res = await this.ctx.axios.post("/api/v1/documents/documents", form, {
-      headers: form.getHeaders(),
-      maxBodyLength: Infinity,
-      maxContentLength: Infinity
-    });
-    const created = res.data?.document ?? res.data;
-    if (created?.id) node.id = created.id;
-    node.isNew = false;
-    node.size = (await import_fs_extra32.default.stat(local)).size;
+    if (mode === "create") {
+      if (node.folderId) form.append("documents_folder_id", node.folderId);
+      else if (node.workspaceId) form.append("workspace_id", node.workspaceId);
+      if (node.name.toLowerCase().endsWith(".md")) {
+        this.log(`\u26A0\uFE0F  ${node.name}: write-back markdown \u2014 voir caveat collab #508`);
+      }
+      const res = await this.ctx.axios.post("/api/v1/documents/documents", form, {
+        headers: form.getHeaders(),
+        maxBodyLength: Infinity,
+        maxContentLength: Infinity
+      });
+      const created = res.data?.document ?? res.data;
+      if (created?.id) node.id = created.id;
+      node.isNew = false;
+    } else {
+      await this.ctx.axios.patch(`/api/v1/documents/documents/${node.id}`, form, {
+        headers: form.getHeaders(),
+        maxBodyLength: Infinity,
+        maxContentLength: Infinity
+      });
+    }
+    node.size = size;
+  }
+  async uploadNew(node) {
+    await this.uploadNode(node, "create");
   }
   async uploadUpdate(node) {
-    const local = this.cacheFileFor(node);
-    const form = new import_form_data5.default();
-    form.append("uploaded_file", import_fs_extra32.default.createReadStream(local), {
-      filename: node.name,
-      contentType: "application/octet-stream"
-    });
-    await this.ctx.axios.patch(`/api/v1/documents/documents/${node.id}`, form, {
-      headers: form.getHeaders(),
-      maxBodyLength: Infinity,
-      maxContentLength: Infinity
-    });
-    node.size = (await import_fs_extra32.default.stat(local)).size;
+    await this.uploadNode(node, "update");
+  }
+  /**
+   * If `node` has unpushed writes, upload them now and clear the dirty flag.
+   * Called from `flush` / `fsync` / `release` so that `close(fd)` (or an
+   * explicit `fsync(fd)`) in userspace blocks until the server has the new
+   * bytes — makes read-after-write via the API (from another process, or
+   * from the same one after close()) immediately consistent.
+   *
+   * The FUSE contract:
+   *   - `flush` fires on every `close(2)` in userspace (once per close, even
+   *     for dup'd fds).
+   *   - `release` fires only after the last reference to the file is dropped
+   *     by the kernel — potentially long after `close(2)` returned.
+   * So `flush` (not `release`) is where the upload has to happen for the
+   * close→read-back sequence to be reliable.
+   */
+  async flushDirty(node) {
+    if (!node.dirty) return;
+    if (this.opts.readOnly) return;
+    if (node.localOnly) {
+      node.dirty = false;
+      node.mtime = /* @__PURE__ */ new Date();
+      return;
+    }
+    if (node.isNew || !node.id) await this.uploadNew(node);
+    else await this.uploadUpdate(node);
+    node.dirty = false;
+    node.mtime = /* @__PURE__ */ new Date();
   }
   invalidateParent(p3) {
     const parent = this.nodes.get(parentPath(p3));
     if (parent) parent.loadedAt = 0;
   }
   // --- FUSE ops ------------------------------------------------------------
+  /**
+   * Public accessor for the FUSE ops object. Used by the mount lifecycle
+   * to hand the ops to the native binding, and by the test suite to drive
+   * the filesystem without loading the native binding. Callers must first
+   * install a compatible error-code source via `setFuseBinding()` (the
+   * mount path does this via require('@cocalc/fuse-native')).
+   */
+  getOps() {
+    if (!this.fuse) {
+      throw new Error("FUSE binding not set \u2014 call setFuseBinding() or mount() first");
+    }
+    return this.ops();
+  }
+  /** Inject a FUSE-like error-code source. Exposed for tests. */
+  setFuseBinding(binding) {
+    this.fuse = binding;
+  }
   ops() {
     const Fuse = this.fuse;
     const ro = !!this.opts.readOnly;
@@ -732781,7 +732906,18 @@ var HubdocFs = class {
         if (node.kind !== "file") return cb(Fuse.EISDIR);
         const write = (flags & 3) !== 0;
         if (write && ro) return cb(Fuse.EACCES);
-        if (node.id) await this.download(node);
+        const truncOnOpen = (flags & import_fs3.constants.O_TRUNC) !== 0;
+        if (truncOnOpen && !node.localOnly && !ro) {
+          await import_fs_extra32.default.writeFile(this.cacheFileFor(node), Buffer.alloc(0));
+          node.downloaded = true;
+          node.dirty = true;
+          node.size = 0;
+        } else if (node.id && !node.localOnly) {
+          await this.download(node);
+        } else if (!node.cachePath || !await import_fs_extra32.default.pathExists(node.cachePath)) {
+          await import_fs_extra32.default.writeFile(this.cacheFileFor(node), Buffer.alloc(0));
+          node.downloaded = true;
+        }
         const localFd = await import_fs_extra32.default.open(this.cacheFileFor(node), "r+").catch(async () => import_fs_extra32.default.open(this.cacheFileFor(node), "w+"));
         const fd = this.nextFd++;
         this.handles.set(fd, { node, localFd, write });
@@ -732827,7 +732963,10 @@ var HubdocFs = class {
           mtime: /* @__PURE__ */ new Date(),
           isNew: true,
           dirty: true,
-          downloaded: true
+          downloaded: true,
+          // Office / LibreOffice lockfiles must never be pushed to the server —
+          // they are pure kernel-side artefacts of an in-progress save.
+          localOnly: isOfficeLockfile(name)
         };
         await import_fs_extra32.default.writeFile(this.cacheFileFor(node), Buffer.alloc(0));
         this.nodes.set(p3, node);
@@ -732845,21 +732984,28 @@ var HubdocFs = class {
           await import_fs_extra32.default.close(h3.localFd);
         } catch {
         }
-        if (h3.node.dirty && !ro) {
-          if (h3.node.isNew || !h3.node.id) await this.uploadNew(h3.node);
-          else await this.uploadUpdate(h3.node);
-          h3.node.dirty = false;
-          h3.node.mtime = /* @__PURE__ */ new Date();
-        }
+        await this.flushDirty(h3.node);
+        cb(0);
+      }),
+      flush: wrap(async (_p, fd, cb) => {
+        const h3 = this.handles.get(fd);
+        if (!h3) return cb(0);
+        await this.flushDirty(h3.node);
+        cb(0);
+      }),
+      fsync: wrap(async (_p, fd, _datasync, cb) => {
+        const h3 = this.handles.get(fd);
+        if (!h3) return cb(0);
+        await this.flushDirty(h3.node);
         cb(0);
       }),
-      flush: (_p, _fd, cb) => cb(0),
-      fsync: (_p, _fd, _datasync, cb) => cb(0),
       unlink: wrap(async (p3, cb) => {
         if (ro) return cb(Fuse.EACCES);
         const node = await this.resolve(p3);
         if (!node || node.kind !== "file") return cb(Fuse.ENOENT);
-        if (node.id) await this.ctx.axios.delete(`/api/v1/documents/documents/${node.id}`);
+        if (node.id && !node.localOnly) {
+          await this.ctx.axios.delete(`/api/v1/documents/documents/${node.id}`);
+        }
         if (node.cachePath) await import_fs_extra32.default.remove(node.cachePath).catch(() => {
         });
         this.nodes.delete(p3);
@@ -732907,6 +733053,56 @@ var HubdocFs = class {
         if (!newParent || newParent.kind !== "dir" || newParent.hub === "root") return cb(Fuse.EPERM);
         const newName = import_path34.default.basename(dest);
         const newFolderId = newParent.hub === "folder" ? newParent.folderId : null;
+        if (node.localOnly) {
+          this.nodes.delete(src);
+          node.name = newName;
+          node.folderId = node.kind === "file" ? newFolderId ?? void 0 : node.folderId;
+          node.workspaceId = newParent.workspaceId;
+          this.nodes.set(dest, node);
+          this.invalidateParent(src);
+          this.invalidateParent(dest);
+          return cb(0);
+        }
+        let destNode = null;
+        try {
+          destNode = await this.resolve(dest);
+        } catch {
+        }
+        if (node.kind === "file" && !node.id) {
+          if (destNode && destNode.kind === "file" && destNode.id) {
+            const sourceCache = this.cacheFileFor(node);
+            const local = this.cacheFileFor(destNode);
+            await import_fs_extra32.default.copy(sourceCache, local, { overwrite: true });
+            destNode.dirty = true;
+            destNode.downloaded = true;
+            destNode.name = newName;
+            destNode.folderId = newFolderId ?? void 0;
+            destNode.workspaceId = newParent.workspaceId;
+            await this.uploadNode(destNode, "update");
+            destNode.dirty = false;
+            destNode.mtime = /* @__PURE__ */ new Date();
+            this.nodes.delete(src);
+            await import_fs_extra32.default.remove(sourceCache).catch(() => {
+            });
+            this.invalidateParent(src);
+            this.invalidateParent(dest);
+            return cb(0);
+          }
+          node.name = newName;
+          node.folderId = newFolderId ?? void 0;
+          node.workspaceId = newParent.workspaceId;
+          await this.uploadNew(node);
+          this.nodes.delete(src);
+          this.nodes.set(dest, node);
+          this.invalidateParent(src);
+          this.invalidateParent(dest);
+          return cb(0);
+        }
+        if (destNode && destNode !== node && destNode.kind === "file" && destNode.id) {
+          await this.ctx.axios.delete(`/api/v1/documents/documents/${destNode.id}`).catch(() => {
+          });
+          this.nodes.delete(dest);
+        }
         const resource = node.kind === "file" ? "documents" : "folders";
         if (!node.id) return cb(Fuse.EPERM);
         await this.ctx.axios.patch(`/api/v1/documents/${resource}/${node.id}`, {
@@ -732940,7 +733136,7 @@ var HubdocFs = class {
     }
     this.fuse = Fuse;
     await import_fs_extra32.default.ensureDir(mountPath);
-    const fuse = new Fuse(mountPath, this.ops(), {
+    const fuse = new Fuse(mountPath, this.getOps(), {
       force: true,
       mkdir: true,
       displayFolder: "Hubdoc",
@@ -733760,7 +733956,7 @@ async function handlePermissionsShow(id, opts) {
 // apps/cli/cli.ts
 var getVersion = () => {
   try {
-    if (true) return "1.8.1";
+    if (true) return "1.8.3";
   } catch {
   }
   for (const candidate of [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sinoia/hubdoc-tools",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "Professional command-line tool for HubDoc document management and bulk import/export",
   "main": "cli.js",
   "bin": {