@mytegroupinc/myte-core 0.0.56 → 0.0.57

package/mytecody-cli.js

@@ -8,11 +8,17 @@ const crypto = require("crypto");
 const zlib = require("zlib");
 const { spawn } = require("child_process");
 const readline = require("readline");
-const {
-  DEFAULT_MYTEAI_BASE,
-  normalizeMyteAiBase,
-} = require("./lib/ai-gateway");
-const { createMyteSplash } = require("./lib/mytecody-splash");
+const {
+  DEFAULT_MYTEAI_BASE,
+  normalizeMyteAiBase,
+} = require("./lib/ai-gateway");
+const { createMyteSplash } = require("./lib/mytecody-splash");
+const {
+  checkPackageUpdate: checkSharedPackageUpdate,
+  isVersionNewer,
+  packageStatusBase: buildPackageStatusBase,
+  packageUpdateNotice,
+} = require("./lib/package-update-check");
 
 const PACKAGE_NAME = "myte";
 const PACKAGE_VERSION = require("./package.json").version;
@@ -474,93 +480,45 @@ function packageLatestUrl(args = {}) {
   );
 }
 
-function packageUpdateCheckEnabled(args = {}) {
-  if (args["package-update-check"] === false) return false;
-  return process.env.MYTE_CODY_PACKAGE_UPDATE_CHECK !== "0";
-}
-
-function packageStatusBase(args = {}) {
-  return {
-    name: PACKAGE_NAME,
-    installed_version: PACKAGE_VERSION,
-    latest_version: null,
-    update_available: null,
-    check_status: "not-checked",
-    latest_url: packageLatestUrl(args),
-    update_command: `npm install -g ${PACKAGE_NAME}@latest`,
-    engine_update_command: "mytecody update",
-  };
-}
-
-function parseSemverish(version) {
-  const main = String(version || "")
-    .trim()
-    .replace(/^v/i, "")
-    .split(/[+-]/)[0];
-  const match = main.match(/^(\d+)(?:\.(\d+))?(?:\.(\d+))?/);
-  if (!match) return null;
-  return [match[1], match[2] || "0", match[3] || "0"].map((part) => Number(part));
-}
-
-function compareSemverish(left, right) {
-  const leftParts = parseSemverish(left);
-  const rightParts = parseSemverish(right);
-  if (!leftParts || !rightParts) return String(left || "").localeCompare(String(right || ""));
-  for (let i = 0; i < 3; i += 1) {
-    if (leftParts[i] > rightParts[i]) return 1;
-    if (leftParts[i] < rightParts[i]) return -1;
-  }
-  return 0;
-}
-
-function isVersionNewer(latest, installed = PACKAGE_VERSION) {
-  return compareSemverish(latest, installed) > 0;
-}
+function packageUpdateCheckEnabled(args = {}) {
+  if (args["package-update-check"] === false || args["update-check"] === false) return false;
+  return process.env.MYTE_CODY_PACKAGE_UPDATE_CHECK !== "0";
+}
+
+function packageStatusBase(args = {}) {
+  return {
+    ...buildPackageStatusBase({
+      packageName: PACKAGE_NAME,
+      installedVersion: PACKAGE_VERSION,
+      latestUrl: packageLatestUrl(args),
+      updateCommand: `npm install -g ${PACKAGE_NAME}@latest`,
+    }),
+    engine_update_command: "mytecody update",
+  };
+}
 
 function packageUpdateTimeoutMs() {
   const value = Number(process.env.MYTE_CODY_PACKAGE_UPDATE_TIMEOUT_MS || 1500);
   return Number.isFinite(value) && value > 0 ? value : 1500;
 }
 
-async function checkPackageUpdate(args = {}) {
-  const status = packageStatusBase(args);
-  if (!packageUpdateCheckEnabled(args)) {
-    return { ...status, check_status: "skipped" };
-  }
-  try {
-    const response = await fetchJson(status.latest_url, {
-      timeoutMs: packageUpdateTimeoutMs(),
-    });
-    if (!response.ok) {
-      return {
-        ...status,
-        check_status: "unavailable",
-        registry_status: response.status,
-      };
-    }
-    const latestVersion = response.body && response.body.version ? String(response.body.version) : "";
-    if (!latestVersion) {
-      return { ...status, check_status: "invalid-response" };
-    }
-    return {
-      ...status,
-      latest_version: latestVersion,
-      update_available: isVersionNewer(latestVersion, PACKAGE_VERSION),
-      check_status: "ok",
-    };
-  } catch (error) {
-    return {
-      ...status,
-      check_status: "unavailable",
-      error: error && error.message ? error.message : String(error),
-    };
-  }
-}
-
-function packageUpdateNotice(packageStatus) {
-  if (!packageStatus || packageStatus.update_available !== true) return "";
-  return `myte package update available: ${packageStatus.latest_version} (installed ${packageStatus.installed_version}). Run ${packageStatus.update_command}`;
-}
+async function checkPackageUpdate(args = {}) {
+  return checkSharedPackageUpdate({
+    packageName: PACKAGE_NAME,
+    installedVersion: PACKAGE_VERSION,
+    latestUrl: packageLatestUrl(args),
+    updateCommand: `npm install -g ${PACKAGE_NAME}@latest`,
+    enabled: packageUpdateCheckEnabled(args),
+    timeoutMs: packageUpdateTimeoutMs(),
+    cacheDir: args["package-cache-dir"] === false
+      ? false
+      : process.env.MYTE_PACKAGE_UPDATE_CACHE_DIR || undefined,
+    fetchJson,
+  }).then((status) => ({
+    ...status,
+    engine_update_command: "mytecody update",
+  }));
+}
 
 function printJson(payload) {
   console.log(JSON.stringify(payload, null, 2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mytegroupinc/myte-core",
-  "version": "0.0.56",
+  "version": "0.0.57",
   "description": "Myte CLI core implementation.",
   "type": "commonjs",
   "main": "cli.js",