@regressionproof/snapshotter 0.7.1 → 0.7.2

package/build/esm/scripts/runPush.d.ts

@@ -0,0 +1 @@
+export {};

package/build/esm/scripts/runPush.js

@@ -0,0 +1,83 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { existsSync, mkdirSync, unlinkSync, writeFileSync } from 'fs';
+import path from 'path';
+import { buildLog } from '@sprucelabs/spruce-skill-utils';
+import ErrorHandler from '../components/ErrorHandler.js.js';
+import { gitPush } from '../git.js.js';
+const LOCK_FILE_NAME = 'push.lock';
+const PENDING_FILE_NAME = 'push.pending';
+const log = buildLog('Snapshotter');
+function main() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const mirrorPath = getEnvOrExit('MIRROR_PATH');
+        const remoteUrl = getEnvOrExit('REMOTE_URL');
+        const remoteToken = getEnvOrExit('REMOTE_TOKEN');
+        const snapshotterDir = path.join(mirrorPath, '.snapshotter');
+        mkdirSync(snapshotterDir, { recursive: true });
+        const lockPath = path.join(snapshotterDir, LOCK_FILE_NAME);
+        const pendingPath = path.join(snapshotterDir, PENDING_FILE_NAME);
+        if (existsSync(lockPath)) {
+            writeFileSync(pendingPath, new Date().toISOString());
+            log.info('Push already running, marked pending', mirrorPath);
+            return;
+        }
+        try {
+            writeFileSync(lockPath, process.pid.toString());
+            const remote = {
+                url: remoteUrl,
+                token: remoteToken,
+            };
+            yield processLoop(mirrorPath, remote, pendingPath);
+        }
+        finally {
+            if (existsSync(lockPath)) {
+                unlinkSync(lockPath);
+            }
+        }
+    });
+}
+function processLoop(mirrorPath, remote, pendingPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        while (true) {
+            if (existsSync(pendingPath)) {
+                unlinkSync(pendingPath);
+            }
+            try {
+                log.info('Push starting', remote.url);
+                yield gitPush(mirrorPath, remote, log);
+                log.info('Push completed', remote.url);
+                ErrorHandler.Handler().clearError(mirrorPath);
+            }
+            catch (err) {
+                const message = err instanceof Error ? err.message : String(err);
+                log.error('Push failed', message);
+                ErrorHandler.Handler().persistError(mirrorPath, err);
+                writeFileSync(pendingPath, new Date().toISOString());
+                return;
+            }
+            if (!existsSync(pendingPath)) {
+                return;
+            }
+        }
+    });
+}
+function getEnvOrExit(name) {
+    const value = process.env[name];
+    if (!value) {
+        console.error(`Missing required env var: ${name}`);
+        process.exit(1);
+    }
+    return value;
+}
+main().catch((err) => {
+    console.error('Push script failed:', err);
+    process.exit(1);
+});

package/build/esm/strategies/SyncStrategy.d.ts

@@ -2,7 +2,9 @@ import { SnapshotOptions } from '../snapshotter.types.js';
 import SnapshotStrategy from './SnapshotStrategy.js';
 export default class SyncStrategy implements SnapshotStrategy {
     private log;
+    private pushScriptPath;
     private constructor();
     static Strategy(): SyncStrategy;
     execute(options: SnapshotOptions): Promise<void>;
+    private spawnPushProcess;
 }

package/build/esm/strategies/SyncStrategy.js

@@ -7,14 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { spawn } from 'child_process';
+import path from 'path';
 import { buildLog } from '@sprucelabs/spruce-skill-utils';
 import ErrorHandler from '../components/ErrorHandler.js.js';
 import FileSyncer from '../components/FileSyncer.js.js';
 import TestResultsWriter from '../components/TestResultsWriter.js.js';
-import { gitCommit, gitPush } from '../git.js.js';
+import { gitCommit } from '../git.js.js';
 export default class SyncStrategy {
     constructor() {
         this.log = buildLog('Snapshotter');
+        this.pushScriptPath = path.join(__dirname, '..', 'scripts', 'runPush.js');
     }
     static Strategy() {
         return new this();
@@ -36,10 +39,8 @@ export default class SyncStrategy {
                     ErrorHandler.Handler().clearError(mirrorPath);
                     return;
                 }
-                this.log.info('Commit created, pushing', remote.url);
-                yield gitPush(mirrorPath, remote, this.log);
-                this.log.info('Push completed', remote.url);
-                ErrorHandler.Handler().clearError(mirrorPath);
+                this.log.info('Commit created, queueing push', remote.url);
+                this.spawnPushProcess(mirrorPath, remote);
             }
             catch (err) {
                 const message = err instanceof Error ? err.message : String(err);
@@ -49,4 +50,12 @@ export default class SyncStrategy {
             }
         });
     }
+    spawnPushProcess(mirrorPath, remote) {
+        const child = spawn('node', [this.pushScriptPath], {
+            detached: true,
+            stdio: 'ignore',
+            env: Object.assign(Object.assign({}, process.env), { MIRROR_PATH: mirrorPath, REMOTE_URL: remote.url, REMOTE_TOKEN: remote.token }),
+        });
+        child.unref();
+    }
 }

package/build/scripts/runPush.d.ts

@@ -0,0 +1 @@
+export {};

package/build/scripts/runPush.js

@@ -0,0 +1,75 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
+const ErrorHandler_js_1 = __importDefault(require("../components/ErrorHandler.js"));
+const git_js_1 = require("../git.js");
+const LOCK_FILE_NAME = 'push.lock';
+const PENDING_FILE_NAME = 'push.pending';
+const log = (0, spruce_skill_utils_1.buildLog)('Snapshotter');
+async function main() {
+    const mirrorPath = getEnvOrExit('MIRROR_PATH');
+    const remoteUrl = getEnvOrExit('REMOTE_URL');
+    const remoteToken = getEnvOrExit('REMOTE_TOKEN');
+    const snapshotterDir = path_1.default.join(mirrorPath, '.snapshotter');
+    (0, fs_1.mkdirSync)(snapshotterDir, { recursive: true });
+    const lockPath = path_1.default.join(snapshotterDir, LOCK_FILE_NAME);
+    const pendingPath = path_1.default.join(snapshotterDir, PENDING_FILE_NAME);
+    if ((0, fs_1.existsSync)(lockPath)) {
+        (0, fs_1.writeFileSync)(pendingPath, new Date().toISOString());
+        log.info('Push already running, marked pending', mirrorPath);
+        return;
+    }
+    try {
+        (0, fs_1.writeFileSync)(lockPath, process.pid.toString());
+        const remote = {
+            url: remoteUrl,
+            token: remoteToken,
+        };
+        await processLoop(mirrorPath, remote, pendingPath);
+    }
+    finally {
+        if ((0, fs_1.existsSync)(lockPath)) {
+            (0, fs_1.unlinkSync)(lockPath);
+        }
+    }
+}
+async function processLoop(mirrorPath, remote, pendingPath) {
+    while (true) {
+        if ((0, fs_1.existsSync)(pendingPath)) {
+            (0, fs_1.unlinkSync)(pendingPath);
+        }
+        try {
+            log.info('Push starting', remote.url);
+            await (0, git_js_1.gitPush)(mirrorPath, remote, log);
+            log.info('Push completed', remote.url);
+            ErrorHandler_js_1.default.Handler().clearError(mirrorPath);
+        }
+        catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            log.error('Push failed', message);
+            ErrorHandler_js_1.default.Handler().persistError(mirrorPath, err);
+            (0, fs_1.writeFileSync)(pendingPath, new Date().toISOString());
+            return;
+        }
+        if (!(0, fs_1.existsSync)(pendingPath)) {
+            return;
+        }
+    }
+}
+function getEnvOrExit(name) {
+    const value = process.env[name];
+    if (!value) {
+        console.error(`Missing required env var: ${name}`);
+        process.exit(1);
+    }
+    return value;
+}
+main().catch((err) => {
+    console.error('Push script failed:', err);
+    process.exit(1);
+});

package/build/strategies/SyncStrategy.d.ts

@@ -2,7 +2,9 @@ import { SnapshotOptions } from '../snapshotter.types.js';
 import SnapshotStrategy from './SnapshotStrategy.js';
 export default class SyncStrategy implements SnapshotStrategy {
     private log;
+    private pushScriptPath;
     private constructor();
     static Strategy(): SyncStrategy;
     execute(options: SnapshotOptions): Promise<void>;
+    private spawnPushProcess;
 }

package/build/strategies/SyncStrategy.js

@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const child_process_1 = require("child_process");
+const path_1 = __importDefault(require("path"));
 const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
 const ErrorHandler_js_1 = __importDefault(require("../components/ErrorHandler.js"));
 const FileSyncer_js_1 = __importDefault(require("../components/FileSyncer.js"));
@@ -11,6 +13,7 @@ const git_js_1 = require("../git.js");
 class SyncStrategy {
     constructor() {
         this.log = (0, spruce_skill_utils_1.buildLog)('Snapshotter');
+        this.pushScriptPath = path_1.default.join(__dirname, '..', 'scripts', 'runPush.js');
     }
     static Strategy() {
         return new this();
@@ -30,10 +33,8 @@ class SyncStrategy {
                 ErrorHandler_js_1.default.Handler().clearError(mirrorPath);
                 return;
             }
-            this.log.info('Commit created, pushing', remote.url);
-            await (0, git_js_1.gitPush)(mirrorPath, remote, this.log);
-            this.log.info('Push completed', remote.url);
-            ErrorHandler_js_1.default.Handler().clearError(mirrorPath);
+            this.log.info('Commit created, queueing push', remote.url);
+            this.spawnPushProcess(mirrorPath, remote);
         }
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);
@@ -42,5 +43,18 @@ class SyncStrategy {
             throw err;
         }
     }
+    spawnPushProcess(mirrorPath, remote) {
+        const child = (0, child_process_1.spawn)('node', [this.pushScriptPath], {
+            detached: true,
+            stdio: 'ignore',
+            env: {
+                ...process.env,
+                MIRROR_PATH: mirrorPath,
+                REMOTE_URL: remote.url,
+                REMOTE_TOKEN: remote.token,
+            },
+        });
+        child.unref();
+    }
 }
 exports.default = SyncStrategy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regressionproof/snapshotter",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "publishConfig": {
     "access": "public"
   },
@@ -94,5 +94,5 @@
     "@sprucelabs/spruce-core-schemas": "^42.1.3",
     "@sprucelabs/spruce-skill-utils": "^34.0.3"
   },
-  "gitHead": "c38dea336a4653790787044ca8b4209a9e5352fa"
+  "gitHead": "a557f1266fcb9720f9551efb6fa6523e7390101e"
 }