obsidian-testing-framework 0.4.0 → 0.4.2

package/lib/index.js

@@ -14,7 +14,7 @@ export const test = base.extend({
             const vaultHash = randomBytes(8).toString("hex").toLocaleLowerCase();
             await run(vaultHash);
         },
-        { auto: true, scope: "test" },
+        { auto: true },
     ],
     electronApp: [
         async ({ ___vaultId: vaultId }, run) => {
@@ -23,7 +23,7 @@ export const test = base.extend({
             const vault = inject("vault");
             const vaultPoolDir = inject("vaultPoolDir");
             console.log("asar located at:", getExe(obsidianPath));
-            generateVaultConfig(vault, vaultId, concurrent, vaultPoolDir);
+            await generateVaultConfig(vault, vaultId, concurrent, vaultPoolDir);
             const tmp = JSON.parse(readFileSync(path.join(findConfig(), "obsidian.json")).toString());
             console.log("vaultid", vaultId, vaultId in tmp.vaults);
             let uriArg = "";

package/lib/internal-util.d.ts

@@ -13,4 +13,4 @@ export declare function checkToy(): void;
 export declare function getExe(obsidianPath?: string): string;
 export declare function addConsoleListener(app: ElectronApplication): void;
 export declare function findConfig(): any;
-export declare function generateVaultConfig(vault: string, vaultHash: string, concurrent: Concurrency, vaultPoolDir: string): string;
+export declare function generateVaultConfig(vault: string, vaultHash: string, concurrent: Concurrency, vaultPoolDir: string): Promise<string>;

package/lib/internal-util.js

@@ -1,5 +1,7 @@
 import path from "path";
-import { cpSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, writeFileSync } from "fs";
+import { cp, readFile, writeFile } from "fs/promises";
+import { lock } from "proper-lockfile";
 import symlinkDir from "symlink-dir";
 export function checkToy() {
     if (process.platform == "darwin") {
@@ -57,30 +59,44 @@ export function findConfig() {
     }
     return configLocation;
 }
-export function generateVaultConfig(vault, vaultHash, concurrent, vaultPoolDir) {
+export async function generateVaultConfig(vault, vaultHash, concurrent, vaultPoolDir) {
     let configLocation = findConfig();
     console.log("vault is", vault, existsSync(vault));
     const obsidianConfigFile = path.join(configLocation, "obsidian.json");
     if (!existsSync(obsidianConfigFile)) {
         writeFileSync(obsidianConfigFile, JSON.stringify({ vaults: {} }));
     }
-    const json = JSON.parse(readFileSync(obsidianConfigFile).toString());
-    if (concurrent === "symlink") {
-        symlinkDir.sync(vault, path.join(vaultPoolDir, vaultHash));
-    }
-    else if (concurrent === "copy") {
-        cpSync(vault, path.join(vaultPoolDir, vaultHash), { recursive: true });
+    let releaser;
+    releaser = await lock(obsidianConfigFile, {
+        retries: 5,
+    });
+    try {
+        const json = JSON.parse((await readFile(obsidianConfigFile)).toString());
+        const hasVault = Object.values(json.vaults).some((a) => a.path === vault);
+        if (concurrent === "symlink") {
+            await symlinkDir(vault, path.join(vaultPoolDir, vaultHash));
+        }
+        else if (concurrent === "copy") {
+            await cp(vault, path.join(vaultPoolDir, vaultHash), { recursive: true });
+        }
+        if (!hasVault) {
+            json.vaults[vaultHash] = {
+                path: concurrent ? path.join(vaultPoolDir, vaultHash) : vault,
+                ts: Date.now(),
+            };
+            await writeFile(obsidianConfigFile, JSON.stringify(json, null, "\t"));
+            return vaultHash;
+        }
+        else {
+            return Object.entries(json.vaults).find((a) => a[1].path === vault)[0];
+        }
     }
-    if (!Object.values(json.vaults).some((a) => a.path === vault)) {
-        json.vaults[vaultHash] = {
-            path: concurrent ? path.join(vaultPoolDir, vaultHash) : vault,
-            ts: Date.now(),
-        };
-        writeFileSync(obsidianConfigFile, JSON.stringify(json, null, "\t"));
-        writeFileSync(path.join(configLocation, `${vaultHash}.json`), "{}");
-        return vaultHash;
+    catch (err) {
+        console.error("error generating vault config", err);
     }
-    else {
-        return Object.entries(json.vaults).find((a) => a[1].path === vault)[0];
+    finally {
+        await releaser();
     }
+    await writeFile(path.join(configLocation, `${vaultHash}.json`), "{}");
+    return vaultHash;
 }

package/package.json

@@ -12,6 +12,7 @@
     "electron": "^33.0.2",
     "obsidian": "latest",
     "playwright": "^1.58.2",
+    "proper-lockfile": "^4.1.2",
     "symlink-dir": "^9.0.0",
     "tmp": "^0.2.3",
     "typescript": "^5.6.3",
@@ -28,7 +29,7 @@
     ".": "./lib/index.js"
   },
   "readme": "",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
   "repository": {
@@ -42,6 +43,7 @@
     "prepare": "yarn run build"
   },
   "devDependencies": {
+    "@types/proper-lockfile": "^4",
     "@types/tmp": "^0",
     "rimraf": "^6.0.1",
     "vitest": "^4.1.0"