@pasko70/pibo 3.2.3 → 3.2.4

package/dist/vscode/install.js

@@ -11,13 +11,13 @@
  * The resolved VSIX is cached under `~/.pibo/vscode/cache/<tagName>/` so
  * repeated installs do not re-download.
  */
+import { createHash } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
 import { detectCodeBinary, listInstalledExtensions, runCodeCommand } from "./code-cli.js";
 import { downloadVsixAsset, fetchLatestVsix, isVsixAsset } from "./vsix-fetcher.js";
 import { DEFAULT_GITHUB_OWNER, DEFAULT_GITHUB_REPO, PIBO_VSCODE_CACHE_DIR, PIBO_VSCODE_EXTENSION_ID, } from "./types.js";
-import { findVsixAsset, fetchRelease } from "./vsix-fetcher.js";
 const DEFAULT_LOG = (message) => {
     console.log(message);
 };
@@ -33,6 +33,9 @@ function getCacheDir(options) {
 function cacheKeyForVersion(tagName) {
     return tagName.replace(/[^A-Za-z0-9._-]/g, "_");
 }
+function cacheTagForUrl(url) {
+    return `url-${createHash("sha256").update(url).digest("hex").slice(0, 16)}`;
+}
 function readCachedVsix(cacheDir, tagName) {
     const dir = join(cacheDir, cacheKeyForVersion(tagName));
     const path = join(dir, "pibo.vsix");
@@ -73,19 +76,23 @@ export async function resolveVsixArtifact(options) {
         }
         return { tagName: "local", vsixPath: absolute };
     }
+    if (options.fromUrl) {
+        const tagName = cacheTagForUrl(options.fromUrl);
+        if (!options.skipCache) {
+            const cached = readCachedVsix(options.cacheDir, tagName);
+            if (cached)
+                return { tagName, vsixPath: cached };
+        }
+        const bytes = await downloadVsixAsset({ url: options.fromUrl, fetchImpl: options.fetchImpl });
+        const cachedPath = writeCachedVsix(options.cacheDir, tagName, bytes);
+        return { tagName, vsixPath: cachedPath, bytes };
+    }
     if (!options.skipCache && !options.version) {
         const cachedTag = readCachedTagManifest(options.cacheDir);
         if (cachedTag?.tagName && cachedTag.vsixPath && existsSync(cachedTag.vsixPath)) {
             return { tagName: cachedTag.tagName, vsixPath: cachedTag.vsixPath };
         }
     }
-    if (options.fromUrl) {
-        const release = await fetchRelease({ owner: options.owner, repo: options.repo, fetchImpl: options.fetchImpl });
-        const asset = findVsixAsset(release) ?? { name: "remote.vsix", browserDownloadUrl: options.fromUrl, size: 0, contentType: "application/octet-stream" };
-        const bytes = await downloadVsixAsset({ url: options.fromUrl, fetchImpl: options.fetchImpl });
-        const cachedPath = writeCachedVsix(options.cacheDir, release.tagName, bytes);
-        return { tagName: release.tagName, vsixPath: cachedPath, bytes };
-    }
     const result = await fetchLatestVsix({
         owner: options.owner,
         repo: options.repo,
@@ -151,7 +158,6 @@ export async function runInstall(options) {
         errorLog(reason);
         return { status: "failed", reason, codeBinary: detected.path, tagName: artifact.tagName };
     }
-    writeCachedTagManifest(cacheDir, artifact.tagName, artifact.vsixPath);
     try {
         const installed = await listInstalledExtensions({
             binary: detected.path,
@@ -159,18 +165,19 @@ export async function runInstall(options) {
             env: options.env,
         });
         const ours = installed.find((entry) => entry.id === PIBO_VSCODE_EXTENSION_ID);
-        if (ours) {
-            log(`Installed ${ours.id}@${ours.version ?? "?"} via ${detected.path}`);
-        }
-        else {
-            log(`code --install-extension reported success but ${PIBO_VSCODE_EXTENSION_ID} is not in the installed list.`);
+        if (!ours) {
+            const reason = `code --install-extension reported success but ${PIBO_VSCODE_EXTENSION_ID} is not in the installed list.`;
+            errorLog(reason);
+            return { status: "failed", reason, codeBinary: detected.path, tagName: artifact.tagName };
         }
+        log(`Installed ${ours.id}@${ours.version ?? "?"} via ${detected.path}`);
     }
     catch (listError) {
         // Listing the installed extensions is a best-effort check; do not fail the install on a listing error.
         const reason = listError instanceof Error ? listError.message : String(listError);
         log(`Install completed; failed to verify via --list-extensions: ${reason}`);
     }
+    writeCachedTagManifest(cacheDir, artifact.tagName, artifact.vsixPath);
     return { status: "installed", tagName: artifact.tagName, vsixPath: artifact.vsixPath, codeBinary: detected.path };
 }
 // Re-export for symmetry with code-cli.ts consumers.

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@pasko70/pibo",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@pasko70/pibo",
-      "version": "3.2.3",
+      "version": "3.2.4",
       "workspaces": [
         "packages/workflows"
       ],

package/package.json

@@ -1,7 +1,9 @@
 {
   "name": "@pasko70/pibo",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "workspaces": [
     "packages/workflows"
   ],