@powerhousedao/ph-cli 6.0.0-dev.96 → 6.0.0-dev.97

package/dist/src/cli.js

@@ -2273,7 +2273,7 @@ var require_ms = __commonJS((exports, module2) => {
   }
 });
 
-// ../../node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/common.js
+// ../../node_modules/.pnpm/debug@4.4.3_supports-color@5.5.0/node_modules/debug/src/common.js
 var require_common = __commonJS((exports, module2) => {
   function setup(env2) {
     createDebug.debug = createDebug;
@@ -2448,7 +2448,7 @@ var require_common = __commonJS((exports, module2) => {
   module2.exports = setup;
 });
 
-// ../../node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/browser.js
+// ../../node_modules/.pnpm/debug@4.4.3_supports-color@5.5.0/node_modules/debug/src/browser.js
 var require_browser = __commonJS((exports, module2) => {
   exports.formatArgs = formatArgs;
   exports.save = save;
@@ -2608,38 +2608,30 @@ var require_browser = __commonJS((exports, module2) => {
   };
 });
 
-// ../../node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js
+// ../../node_modules/.pnpm/has-flag@3.0.0/node_modules/has-flag/index.js
 var require_has_flag = __commonJS((exports, module2) => {
-  module2.exports = (flag, argv = process.argv) => {
+  module2.exports = (flag, argv) => {
+    argv = argv || process.argv;
     const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
-    const position = argv.indexOf(prefix + flag);
-    const terminatorPosition = argv.indexOf("--");
-    return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
+    const pos = argv.indexOf(prefix + flag);
+    const terminatorPos = argv.indexOf("--");
+    return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
   };
 });
 
-// ../../node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js
+// ../../node_modules/.pnpm/supports-color@5.5.0/node_modules/supports-color/index.js
 var require_supports_color = __commonJS((exports, module2) => {
   var os2 = __require("os");
-  var tty2 = __require("tty");
   var hasFlag2 = require_has_flag();
-  var { env: env2 } = process;
-  var flagForceColor2;
-  if (hasFlag2("no-color") || hasFlag2("no-colors") || hasFlag2("color=false") || hasFlag2("color=never")) {
-    flagForceColor2 = 0;
+  var env2 = process.env;
+  var forceColor;
+  if (hasFlag2("no-color") || hasFlag2("no-colors") || hasFlag2("color=false")) {
+    forceColor = false;
   } else if (hasFlag2("color") || hasFlag2("colors") || hasFlag2("color=true") || hasFlag2("color=always")) {
-    flagForceColor2 = 1;
+    forceColor = true;
   }
-  function envForceColor2() {
-    if ("FORCE_COLOR" in env2) {
-      if (env2.FORCE_COLOR === "true") {
-        return 1;
-      }
-      if (env2.FORCE_COLOR === "false") {
-        return 0;
-      }
-      return env2.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env2.FORCE_COLOR, 10), 3);
-    }
+  if ("FORCE_COLOR" in env2) {
+    forceColor = env2.FORCE_COLOR.length === 0 || parseInt(env2.FORCE_COLOR, 10) !== 0;
   }
   function translateLevel2(level) {
     if (level === 0) {
@@ -2652,39 +2644,29 @@ var require_supports_color = __commonJS((exports, module2) => {
       has16m: level >= 3
     };
   }
-  function supportsColor2(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
-    const noFlagForceColor = envForceColor2();
-    if (noFlagForceColor !== undefined) {
-      flagForceColor2 = noFlagForceColor;
-    }
-    const forceColor = sniffFlags ? flagForceColor2 : noFlagForceColor;
-    if (forceColor === 0) {
+  function supportsColor2(stream) {
+    if (forceColor === false) {
       return 0;
     }
-    if (sniffFlags) {
-      if (hasFlag2("color=16m") || hasFlag2("color=full") || hasFlag2("color=truecolor")) {
-        return 3;
-      }
-      if (hasFlag2("color=256")) {
-        return 2;
-      }
+    if (hasFlag2("color=16m") || hasFlag2("color=full") || hasFlag2("color=truecolor")) {
+      return 3;
     }
-    if (haveStream && !streamIsTTY && forceColor === undefined) {
-      return 0;
+    if (hasFlag2("color=256")) {
+      return 2;
     }
-    const min = forceColor || 0;
-    if (env2.TERM === "dumb") {
-      return min;
+    if (stream && !stream.isTTY && forceColor !== true) {
+      return 0;
     }
+    const min = forceColor ? 1 : 0;
     if (process.platform === "win32") {
       const osRelease = os2.release().split(".");
-      if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
+      if (Number(process.versions.node.split(".")[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
         return Number(osRelease[2]) >= 14931 ? 3 : 2;
       }
       return 1;
     }
     if ("CI" in env2) {
-      if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "GITHUB_ACTIONS", "BUILDKITE", "DRONE"].some((sign) => (sign in env2)) || env2.CI_NAME === "codeship") {
+      if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI"].some((sign) => (sign in env2)) || env2.CI_NAME === "codeship") {
         return 1;
       }
       return min;
@@ -2696,7 +2678,7 @@ var require_supports_color = __commonJS((exports, module2) => {
       return 3;
     }
     if ("TERM_PROGRAM" in env2) {
-      const version = Number.parseInt((env2.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
+      const version = parseInt((env2.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
       switch (env2.TERM_PROGRAM) {
         case "iTerm.app":
           return version >= 3 ? 3 : 2;
@@ -2713,23 +2695,23 @@ var require_supports_color = __commonJS((exports, module2) => {
     if ("COLORTERM" in env2) {
       return 1;
     }
+    if (env2.TERM === "dumb") {
+      return min;
+    }
     return min;
   }
-  function getSupportLevel(stream, options = {}) {
-    const level = supportsColor2(stream, {
-      streamIsTTY: stream && stream.isTTY,
-      ...options
-    });
+  function getSupportLevel(stream) {
+    const level = supportsColor2(stream);
     return translateLevel2(level);
   }
   module2.exports = {
     supportsColor: getSupportLevel,
-    stdout: getSupportLevel({ isTTY: tty2.isatty(1) }),
-    stderr: getSupportLevel({ isTTY: tty2.isatty(2) })
+    stdout: getSupportLevel(process.stdout),
+    stderr: getSupportLevel(process.stderr)
   };
 });
 
-// ../../node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/node.js
+// ../../node_modules/.pnpm/debug@4.4.3_supports-color@5.5.0/node_modules/debug/src/node.js
 var require_node = __commonJS((exports, module2) => {
   var tty2 = __require("tty");
   var util = __require("util");
@@ -2900,7 +2882,7 @@ var require_node = __commonJS((exports, module2) => {
   };
 });
 
-// ../../node_modules/.pnpm/debug@4.4.3_supports-color@8.1.1/node_modules/debug/src/index.js
+// ../../node_modules/.pnpm/debug@4.4.3_supports-color@5.5.0/node_modules/debug/src/index.js
 var require_src = __commonJS((exports, module2) => {
   if (typeof process === "undefined" || process.type === "renderer" || false || process.__nwjs) {
     module2.exports = require_browser();
@@ -4402,7 +4384,7 @@ var init_common = __esm(() => {
     type: import_cmd_ts.string,
     description: "Base path for the app",
     env: "PH_CONNECT_BASE_PATH",
-    defaultValue: () => ""
+    defaultValue: () => "/"
   });
   drivesPreserveStrategy = import_cmd_ts.option({
     type: import_cmd_ts.oneOf(DRIVES_PRESERVE_STRATEGIES),
@@ -331794,13 +331776,15 @@ class SimpleJobExecutorManager {
   totalJobsProcessed = 0;
   unsubscribe;
   deferredJobs = new Map;
-  constructor(executorFactory, eventBus, queue, jobTracker, logger3, resolver) {
+  jobTimeoutMs;
+  constructor(executorFactory, eventBus, queue, jobTracker, logger3, resolver, jobTimeoutMs = 30000) {
     this.executorFactory = executorFactory;
     this.eventBus = eventBus;
     this.queue = queue;
     this.jobTracker = jobTracker;
     this.logger = logger3;
     this.resolver = resolver;
+    this.jobTimeoutMs = jobTimeoutMs;
   }
   async start(numExecutors) {
     if (this.isRunning) {
@@ -331881,9 +331865,23 @@ class SimpleJobExecutorManager {
     this.eventBus.emit(ReactorEventTypes.JOB_RUNNING, runningEvent).catch(() => {});
     const executorIndex = this.totalJobsProcessed % this.executors.length;
     const executor = this.executors[executorIndex];
+    const signal = AbortSignal.timeout(this.jobTimeoutMs);
+    const toError = (reason) => reason instanceof Error ? reason : new Error(String(reason));
+    const abortPromise = new Promise((_3, reject) => {
+      if (signal.aborted) {
+        reject(toError(signal.reason));
+        return;
+      }
+      signal.addEventListener("abort", () => reject(toError(signal.reason)), {
+        once: true
+      });
+    });
     let result;
     try {
-      result = await executor.executeJob(handle2.job);
+      result = await Promise.race([
+        executor.executeJob(handle2.job, signal),
+        abortPromise
+      ]);
     } catch (error48) {
       const errorInfo = this.toErrorInfo(error48 instanceof Error ? error48 : String(error48));
       handle2.fail(errorInfo);
@@ -333249,6 +333247,9 @@ class Mailbox {
   init(ackOrdinal) {
     this._ack = this._latestOrdinal = ackOrdinal;
   }
+  advanceOrdinal(ordinal) {
+    this._latestOrdinal = Math.max(this._latestOrdinal, ordinal);
+  }
   get items() {
     return Array.from(this.itemsMap.values());
   }
@@ -333383,6 +333384,9 @@ class BufferedMailbox {
   init(ackOrdinal) {
     this._ack = this._latestOrdinal = ackOrdinal;
   }
+  advanceOrdinal(ordinal) {
+    this._latestOrdinal = Math.max(this._latestOrdinal, ordinal);
+  }
   get items() {
     return Array.from(this.itemsMap.values());
   }
@@ -333897,6 +333901,8 @@ class GqlRequestChannel {
   pushFailureCount = 0;
   pushRetryTimer = null;
   pushBlocked = false;
+  isPushing = false;
+  pendingDrain = false;
   connectionState = "connecting";
   connectionStateCallbacks = new Set;
   constructor(logger3, channelId, remoteName, cursorStorage, config2, operationIndex, pollTimer) {
@@ -333921,20 +333927,19 @@ class GqlRequestChannel {
     this.bufferedOutbox = new BufferedMailbox(500, 25);
     this.outbox = this.bufferedOutbox;
     this.deadLetter = new Mailbox;
-    this.deadLetter.onAdded(() => {
-      this.pollTimer.stop();
-      if (this.pushRetryTimer) {
-        clearTimeout(this.pushRetryTimer);
-        this.pushRetryTimer = null;
+    this.deadLetter.onAdded((syncOps) => {
+      for (const syncOp of syncOps) {
+        this.logger.warn("Dead letter added for document @DocumentId on channel @ChannelId", syncOp.documentId, this.channelId);
       }
-      this.transitionConnectionState("error");
     });
     this.outbox.onAdded((syncOps) => {
       if (this.isShutdown)
         return;
-      if (this.pushBlocked)
+      if (this.isPushing) {
+        this.pendingDrain = true;
         return;
-      if (this.deadLetter.items.length > 0)
+      }
+      if (this.pushBlocked)
         return;
       this.attemptPush(syncOps);
     });
@@ -334250,13 +334255,18 @@ class GqlRequestChannel {
     return { ackOrdinal: data.touchChannel.ackOrdinal };
   }
   attemptPush(syncOps) {
+    this.isPushing = true;
     this.pushSyncOperations(syncOps).then(() => {
+      this.isPushing = false;
       this.pushBlocked = false;
       this.pushFailureCount = 0;
       if (this.connectionState === "reconnecting" || this.connectionState === "error") {
         this.transitionConnectionState("connected");
       }
+      this.drainOutbox();
     }).catch((error48) => {
+      this.isPushing = false;
+      this.pendingDrain = false;
       if (this.isShutdown)
         return;
       const err2 = error48 instanceof Error ? error48 : new Error(String(error48));
@@ -334295,6 +334305,17 @@ class GqlRequestChannel {
       this.attemptPush([...allItems]);
     }, delay);
   }
+  drainOutbox() {
+    if (!this.pendingDrain)
+      return;
+    this.pendingDrain = false;
+    if (this.isShutdown)
+      return;
+    const items = this.outbox.items;
+    if (items.length === 0)
+      return;
+    this.attemptPush([...items]);
+  }
   classifyError(error48) {
     if (!(error48 instanceof GraphQLRequestError)) {
       return "recoverable";
@@ -334970,7 +334991,7 @@ class SyncManager {
   syncStatusTracker;
   maxDeadLettersPerRemote;
   connectionStateUnsubscribes = new Map;
-  loadJobs = new Map;
+  quarantinedDocumentIds = new Set;
   constructor(logger3, remoteStorage, cursorStorage, deadLetterStorage, channelFactory, operationIndex, reactor, eventBus, maxDeadLettersPerRemote = 100) {
     this.logger = logger3;
     this.remoteStorage = remoteStorage;
@@ -334992,6 +335013,14 @@ class SyncManager {
     if (this.isShutdown) {
       throw new Error("SyncManager is already shutdown and cannot be started");
     }
+    try {
+      const quarantinedIds = await this.deadLetterStorage.listQuarantinedDocumentIds();
+      for (const id of quarantinedIds) {
+        this.quarantinedDocumentIds.add(id);
+      }
+    } catch (error48) {
+      this.logger.error("Failed to load quarantined document IDs (@error)", error48 instanceof Error ? error48.message : String(error48));
+    }
     const remoteRecords = await this.remoteStorage.list();
     for (const record2 of remoteRecords) {
       const channel = this.channelFactory.instance(record2.id, record2.name, record2.channelConfig, this.cursorStorage, record2.collectionId, record2.filter, this.operationIndex);
@@ -335156,6 +335185,7 @@ class SyncManager {
     remote.channel.deadLetter.onAdded((syncOps) => {
       for (const syncOp of syncOps) {
         this.logger.error("Dead letter (@remote, @documentId, @jobId, @error, @dependencies)", remote.name, syncOp.documentId, syncOp.jobId, syncOp.error?.message ?? "unknown", syncOp.jobDependencies);
+        this.quarantinedDocumentIds.add(syncOp.documentId);
         const record2 = {
           id: syncOp.id,
           jobId: syncOp.jobId,
@@ -335241,9 +335271,12 @@ class SyncManager {
     if (this.isShutdown) {
       return;
     }
+    const eligible = syncOps.filter((op) => !this.quarantinedDocumentIds.has(op.documentId));
+    if (eligible.length === 0)
+      return;
     const keyed = [];
     const nonKeyed = [];
-    for (const syncOp of syncOps) {
+    for (const syncOp of eligible) {
       if (syncOp.jobId) {
         keyed.push(syncOp);
       } else {
@@ -335287,8 +335320,8 @@ class SyncManager {
       remote.channel.inbox.remove(syncOp);
       return;
     }
-    const jobKey = `${syncOp.documentId}:${syncOp.branch}`;
-    this.loadJobs.set(jobKey, completedJobInfo);
+    if (this.isShutdown)
+      return;
     if (completedJobInfo.status === "FAILED") {
       const errorMessage = completedJobInfo.error?.message || "Unknown error";
       this.logger.error("Failed to apply operations from inbox (@remote, @documentId, @jobId, @error)", remote.name, syncOp.documentId, completedJobInfo.id, errorMessage);
@@ -335325,6 +335358,8 @@ class SyncManager {
       }
       return;
     }
+    if (this.isShutdown)
+      return;
     for (const { remote, syncOp } of items) {
       if (!(syncOp.jobId in result.jobs)) {
         this.logger.error("Job key missing from batch load result (@remote, @documentId, @jobId)", remote.name, syncOp.documentId, syncOp.jobId);
@@ -335347,8 +335382,8 @@ class SyncManager {
         remote.channel.inbox.remove(syncOp);
         continue;
       }
-      const jobKey = `${syncOp.documentId}:${syncOp.branch}`;
-      this.loadJobs.set(jobKey, completedJobInfo);
+      if (this.isShutdown)
+        return;
       if (completedJobInfo.status === "FAILED") {
         const errorMessage = completedJobInfo.error?.message || "Unknown error";
         const channelError = new ChannelError("inbox", new Error(`Failed to apply operations: ${errorMessage}`));
@@ -335361,39 +335396,48 @@ class SyncManager {
     }
   }
   async updateOutbox(remote, ackOrdinal) {
-    const operations2 = await this.getOperationsForRemote(remote, ackOrdinal);
-    if (operations2.length === 0) {
-      return;
-    }
-    operations2.sort((a2, b3) => {
-      if (a2.context.documentId !== b3.context.documentId) {
-        return a2.context.documentId < b3.context.documentId ? -1 : 1;
-      }
-      if (a2.context.scope !== b3.context.scope) {
-        return a2.context.scope < b3.context.scope ? -1 : 1;
-      }
-      return a2.context.ordinal - b3.context.ordinal;
-    });
-    const batches = batchOperationsByDocument(operations2);
+    let maxOrdinal = ackOrdinal;
     const lastJobByDoc = new Map;
-    const syncOps = [];
-    for (const batch of batches) {
-      const jobId = crypto.randomUUID();
-      const prevJobId = lastJobByDoc.get(batch.documentId);
-      const syncOp = new SyncOperation(crypto.randomUUID(), jobId, prevJobId ? [prevJobId] : [], remote.name, batch.documentId, [batch.scope], batch.branch, batch.operations);
-      syncOps.push(syncOp);
-      lastJobByDoc.set(batch.documentId, jobId);
-    }
-    remote.channel.outbox.add(...syncOps);
-  }
-  async getOperationsForRemote(remote, ackOrdinal) {
-    const results = await this.operationIndex.find(remote.collectionId, ackOrdinal, { excludeSourceRemote: remote.name }, undefined, this.abortController.signal);
-    let operations2 = results.results.map((entry) => toOperationWithContext(entry));
     const sinceTimestamp = remote.options.sinceTimestampUtcMs;
-    if (sinceTimestamp && sinceTimestamp !== "0") {
-      operations2 = operations2.filter((op) => op.operation.timestampUtcMs >= sinceTimestamp);
-    }
-    return filterOperations(operations2, remote.filter);
+    let page = await this.operationIndex.find(remote.collectionId, ackOrdinal, { excludeSourceRemote: remote.name }, undefined, this.abortController.signal);
+    let hasMore;
+    do {
+      for (const entry of page.results) {
+        maxOrdinal = Math.max(maxOrdinal, entry.ordinal ?? 0);
+      }
+      let operations2 = page.results.map((entry) => toOperationWithContext(entry));
+      if (sinceTimestamp && sinceTimestamp !== "0") {
+        operations2 = operations2.filter((op) => op.operation.timestampUtcMs >= sinceTimestamp);
+      }
+      operations2 = filterOperations(operations2, remote.filter);
+      operations2 = operations2.filter((op) => !this.quarantinedDocumentIds.has(op.context.documentId));
+      if (operations2.length > 0) {
+        operations2.sort((a2, b3) => {
+          if (a2.context.documentId !== b3.context.documentId) {
+            return a2.context.documentId < b3.context.documentId ? -1 : 1;
+          }
+          if (a2.context.scope !== b3.context.scope) {
+            return a2.context.scope < b3.context.scope ? -1 : 1;
+          }
+          return a2.context.ordinal - b3.context.ordinal;
+        });
+        const batches = batchOperationsByDocument(operations2);
+        const syncOps = [];
+        for (const batch of batches) {
+          const jobId = crypto.randomUUID();
+          const prevJobId = lastJobByDoc.get(batch.documentId);
+          const syncOp = new SyncOperation(crypto.randomUUID(), jobId, prevJobId ? [prevJobId] : [], remote.name, batch.documentId, [batch.scope], batch.branch, batch.operations);
+          syncOps.push(syncOp);
+          lastJobByDoc.set(batch.documentId, jobId);
+        }
+        remote.channel.outbox.add(...syncOps);
+      }
+      hasMore = !!page.next;
+      if (hasMore) {
+        page = await page.next();
+      }
+    } while (hasMore);
+    remote.channel.outbox.advanceOrdinal(maxOrdinal);
   }
 }
 var __defProp2, __returnValue2 = (v3) => v3, __export2 = (target, all) => {