@tenonhq/sincronia-core 0.0.69 → 0.0.72

package/dist/initSystem/corePlugin.js

@@ -87,8 +87,8 @@ exports.corePlugin = {
             key: "app",
             label: "Selecting ServiceNow application",
             run: async (context) => {
-                const instanceUrl = normalizeInstance(context.env.SN_INSTANCE);
-                const client = (0, snClient_1.snClient)(instanceUrl, context.env.SN_USER, context.env.SN_PASSWORD);
+                const baseUrl = instanceBaseUrl(context.env.SN_INSTANCE);
+                const client = (0, snClient_1.snClient)(baseUrl, context.env.SN_USER, context.env.SN_PASSWORD);
                 Logger_1.logger.info("Fetching application list...");
                 const apps = await (0, snClient_1.unwrapSNResponse)(client.getAppList());
                 if (apps.length === 0) {
@@ -167,8 +167,8 @@ exports.corePlugin = {
         }
         // Download application files — errors propagate to orchestrator
         Logger_1.logger.info("Downloading " + scope + "...");
-        const instanceUrl = normalizeInstance(context.env.SN_INSTANCE);
-        const client = (0, snClient_1.snClient)(instanceUrl, context.env.SN_USER, context.env.SN_PASSWORD);
+        const baseUrl = instanceBaseUrl(context.env.SN_INSTANCE);
+        const client = (0, snClient_1.snClient)(baseUrl, context.env.SN_USER, context.env.SN_PASSWORD);
         const config = ConfigManager.getConfig();
         const man = await (0, snClient_1.unwrapSNResponse)(client.getManifest(scope, config, true));
         await AppUtils.processManifest(man);
@@ -191,20 +191,38 @@ async function validateCoreLogin(context) {
         return "Missing required credentials";
     }
     const instanceUrl = normalizeInstance(instance);
+    const baseUrl = instanceBaseUrl(instance);
     try {
-        const client = (0, snClient_1.snClient)(instanceUrl, user, password);
+        const client = (0, snClient_1.snClient)(baseUrl, user, password);
         await (0, snClient_1.unwrapSNResponse)(client.getAppList());
         context.env.SN_INSTANCE = instanceUrl;
         return true;
     }
     catch (e) {
-        return "Connection failed — check your instance URL, username, and password.";
+        const msg = e instanceof Error ? e.message : String(e);
+        const status = e && e.response && e.response.status;
+        if (msg.includes("Invalid URL") || msg.includes("ENOTFOUND") || msg.includes("getaddrinfo")) {
+            return "Instance not found — check the URL (got: " + instanceUrl + ")";
+        }
+        if (status === 401 || msg.includes("401")) {
+            return "Invalid username or password.";
+        }
+        if (status === 403 || msg.includes("403")) {
+            return "Access denied — user may lack required roles.";
+        }
+        if (msg.includes("ECONNREFUSED") || msg.includes("ETIMEDOUT") || msg.includes("ECONNRESET")) {
+            return "Could not reach " + instanceUrl + " — check network connectivity.";
+        }
+        return "Connection failed: " + msg;
     }
 }
 function normalizeInstance(instance) {
     let url = instance.trim().replace("https://", "").replace("http://", "");
-    if (!url.endsWith("/")) {
-        url += "/";
+    if (url.endsWith("/")) {
+        url = url.slice(0, -1);
     }
     return url;
 }
+function instanceBaseUrl(instance) {
+    return "https://" + normalizeInstance(instance) + "/";
+}

package/dist/initSystem/orchestrator.js

@@ -35,10 +35,7 @@ function buildInitContext(plugins) {
         // No .env yet — starting fresh
     }
     // Pull from process.env for keys declared by plugins but missing from .env
-    const pluginEnvKeys = plugins.flatMap(p => [
-        ...(p.login || []).map(h => h.envKey),
-        ...(p.configure || []).map(h => h.key),
-    ]);
+    const pluginEnvKeys = plugins.flatMap(p => (p.login || []).map(h => h.envKey));
     pluginEnvKeys.forEach(key => {
         if (process.env[key] && !env[key]) {
             env[key] = process.env[key];
@@ -76,10 +73,7 @@ async function promptPluginSelection(externalPlugins) {
     const selected = externalPlugins.filter(p => selectedNames.has(p.name));
     return [corePlugin_1.corePlugin, ...selected];
 }
-async function runLoginPhase(plugin, context) {
-    const hooks = plugin.login;
-    if (!hooks || hooks.length === 0)
-        return;
+async function collectLoginHooks(hooks, context) {
     for (const hook of hooks) {
         const existingValue = context.env[hook.envKey] || "";
         // Show instructions if provided
@@ -112,7 +106,63 @@ async function runLoginPhase(plugin, context) {
         const answer = await inquirer_1.default.prompt([promptConfig]);
         context.env[hook.envKey] = answer.value.trim();
     }
-    // Run per-hook validation if defined
+}
+async function runLoginPhase(plugin, context) {
+    const hooks = plugin.login;
+    if (!hooks || hooks.length === 0)
+        return;
+    // Core plugin: retry loop with specific error messages
+    if (plugin.name === "core") {
+        while (true) {
+            await collectLoginHooks(hooks, context);
+            // Run per-hook validation
+            let hookFailed = false;
+            for (const hook of hooks) {
+                if (hook.validate) {
+                    const result = await hook.validate(context.env[hook.envKey], context);
+                    if (result !== true) {
+                        Logger_1.logger.error(chalk_1.default.red("✗ " + result));
+                        hookFailed = true;
+                        break;
+                    }
+                }
+            }
+            if (hookFailed) {
+                const retry = await inquirer_1.default.prompt([{
+                        type: "confirm",
+                        name: "again",
+                        message: "Try again?",
+                        default: true,
+                    }]);
+                if (!retry.again) {
+                    throw new Error("Login cancelled");
+                }
+                context.env.SN_PASSWORD = "";
+                continue;
+            }
+            Logger_1.logger.info("Validating credentials...");
+            const coreResult = await (0, corePlugin_1.validateCoreLogin)(context);
+            if (coreResult === true) {
+                Logger_1.logger.success(chalk_1.default.green("✓ Connected to " + context.env.SN_INSTANCE));
+                return;
+            }
+            Logger_1.logger.error(chalk_1.default.red("✗ " + coreResult));
+            Logger_1.logger.info("");
+            const retry = await inquirer_1.default.prompt([{
+                    type: "confirm",
+                    name: "again",
+                    message: "Try again?",
+                    default: true,
+                }]);
+            if (!retry.again) {
+                throw new Error("Login cancelled");
+            }
+            // Clear password so it re-prompts; instance and user show as defaults
+            context.env.SN_PASSWORD = "";
+        }
+    }
+    // Non-core plugins: original behavior (no retry loop)
+    await collectLoginHooks(hooks, context);
     for (const hook of hooks) {
         if (hook.validate) {
             const result = await hook.validate(context.env[hook.envKey], context);
@@ -122,16 +172,6 @@ async function runLoginPhase(plugin, context) {
             }
         }
     }
-    // Core plugin gets special post-login validation (all 3 credentials at once)
-    if (plugin.name === "core") {
-        Logger_1.logger.info("Validating credentials...");
-        const coreResult = await (0, corePlugin_1.validateCoreLogin)(context);
-        if (coreResult !== true) {
-            Logger_1.logger.error(chalk_1.default.red("✗ " + coreResult));
-            throw new Error("ServiceNow login failed");
-        }
-        Logger_1.logger.success(chalk_1.default.green("✓ Connected to " + context.env.SN_INSTANCE));
-    }
 }
 async function runConfigurePhase(plugin, context) {
     const hooks = plugin.configure;

package/dist/tests/orchestrator.test.js

@@ -3,21 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const corePlugin_1 = require("../initSystem/corePlugin");
 describe("normalizeInstance", function () {
     it("strips https:// prefix", function () {
-        expect((0, corePlugin_1.normalizeInstance)("https://mycompany.service-now.com")).toBe("mycompany.service-now.com/");
+        expect((0, corePlugin_1.normalizeInstance)("https://mycompany.service-now.com")).toBe("mycompany.service-now.com");
     });
     it("strips http:// prefix", function () {
-        expect((0, corePlugin_1.normalizeInstance)("http://mycompany.service-now.com")).toBe("mycompany.service-now.com/");
+        expect((0, corePlugin_1.normalizeInstance)("http://mycompany.service-now.com")).toBe("mycompany.service-now.com");
     });
-    it("adds trailing slash if missing", function () {
-        expect((0, corePlugin_1.normalizeInstance)("mycompany.service-now.com")).toBe("mycompany.service-now.com/");
+    it("returns bare hostname without trailing slash", function () {
+        expect((0, corePlugin_1.normalizeInstance)("mycompany.service-now.com")).toBe("mycompany.service-now.com");
     });
-    it("preserves trailing slash if present", function () {
-        expect((0, corePlugin_1.normalizeInstance)("mycompany.service-now.com/")).toBe("mycompany.service-now.com/");
+    it("strips trailing slash if present", function () {
+        expect((0, corePlugin_1.normalizeInstance)("mycompany.service-now.com/")).toBe("mycompany.service-now.com");
     });
     it("trims whitespace", function () {
-        expect((0, corePlugin_1.normalizeInstance)("  mycompany.service-now.com  ")).toBe("mycompany.service-now.com/");
+        expect((0, corePlugin_1.normalizeInstance)("  mycompany.service-now.com  ")).toBe("mycompany.service-now.com");
     });
     it("handles full URL with protocol and trailing slash", function () {
-        expect((0, corePlugin_1.normalizeInstance)("https://mycompany.service-now.com/")).toBe("mycompany.service-now.com/");
+        expect((0, corePlugin_1.normalizeInstance)("https://mycompany.service-now.com/")).toBe("mycompany.service-now.com");
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenonhq/sincronia-core",
-  "version": "0.0.69",
+  "version": "0.0.72",
   "description": "Next-gen file syncer",
   "license": "GPL-3.0",
   "main": "./dist/index.js",