querysub 0.3.0 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "querysub",
-    "version": "0.3.0",
+    "version": "0.4.0",
     "main": "index.js",
     "license": "MIT",
     "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/-a-archives/archiveCache.ts

@@ -1,24 +1,16 @@
 import { getStorageDir, getSubFolder } from "../fs";
 import { Archives } from "./archives";
-import { diskEscapeFileName, getArchivesLocal } from "./archivesDisk";
 import fs from "fs";
 
-import diskusage from "diskusage";
-import { binarySearchBasic, binarySearchIndex, list, nextId, sort, timeInHour, timeInMinute } from "socket-function/src/misc";
+import { list, nextId, timeInHour, timeInMinute } from "socket-function/src/misc";
 import { cache, lazy } from "socket-function/src/caching";
-import { delay, runInSerial, runInfinitePoll } from "socket-function/src/batching";
+import { runInSerial, runInfinitePoll } from "socket-function/src/batching";
 import { sha256 } from "js-sha256";
-import { devDebugbreak } from "../config";
 import child_process from "child_process";
-import os from "os";
-import fsext, { flock } from "fs-ext";
-import debugbreak from "debugbreak";
-import readline from "readline";
 import { getPPID } from "../misc/getParentProcessId";
 import { Args } from "socket-function/src/types";
 import { getArchivesBackblaze } from "./archivesBackBlaze";
-import { logErrors } from "../errors";
-import { formatNumber, formatTime } from "socket-function/src/formatting/format";
+import { formatNumber } from "socket-function/src/formatting/format";
 import { SizeLimiter } from "../diagnostics/SizeLimiter";
 
 const SIZE_LIMIT = new SizeLimiter({
@@ -702,6 +694,7 @@ async function isLocked(path: string, operation?: {
     return await lockRetryLoop(async function isLocked() {
         let handle = await getHandle(lockPath);
         try {
+            const { flock } = await import("fs-ext");
             await new Promise<void>((r, e) => flock(handle.fd, "ex", err => err ? e(err) : r()));
             let contents = (await handle.readFile()).toString();
             let locks = contents.toString().replaceAll("\0", "").trim().split("\n").filter(x => x);