@dk/hipp 0.1.20 → 0.1.22

package/README.md

@@ -220,16 +220,16 @@ PERFORMANCE OF THIS SOFTWARE.
 Verify this package with [@dk/hipp](https://www.npmjs.com/package/@dk/hipp):
 
 ```bash
-npx @dk/hipp verify @dk/hipp@0.1.20
+npx @dk/hipp verify @dk/hipp@0.1.22
 ```
 
 ```json
 {
   "origin": "git@github.com:dmytri/hipp.git",
-  "tag": "v0.1.20",
-  "revision": "1d5a16d3e837ffd79d4c6704cf1945f6d0b84a60",
-  "hash": "71fe169e31a68c92c249ae2a443a4062dc379b36bf854a290576e7b595ca4e58",
-  "signature": "UpVrjogkhwUyPvGj6bK4vOUj3p9R/JDvuDaupOibXFyK5FibLWzpMwjQWHJa78wYx4D4f/BmAn99J3Xt4icaDg==",
+  "tag": "v0.1.22",
+  "revision": "384db1fb92cd1d5f0c72a32f12748c6b683996e0",
+  "hash": "afad3a4ee75bb430c416067e841dd127de3577c27cd89bbf4064e1da568e1aa1",
+  "signature": "2XhbwQWY5tp/7frdyRjh2ynyigjdu5fumebrfN1/eMvSSuSawNwekZctBs+CfsfBI61V1tu4plzOhRvgsw8AAw==",
   "name": "Dmytri Kleiner",
   "email": "dev@dmytri.to",
   "npm": "11.12.1",

package/hipp.js

@@ -33,6 +33,22 @@ function getGitUserInfo() {
   return { name, email };
 }
 
+function sshToHttpsUrl(sshUrl) {
+  const match = sshUrl.match(/^git@([^:]+):(.+\.git)$/);
+  if (match) {
+    return `https://${match[1]}/${match[2]}`;
+  }
+  return sshUrl;
+}
+
+function httpsToSshUrl(httpsUrl) {
+  const match = httpsUrl.match(/^https:\/\/([^/]+)\/(.+)$/);
+  if (match) {
+    return `git@${match[1]}:${match[2]}`;
+  }
+  return httpsUrl;
+}
+
 function runCmd(cmd, args, options = {}) {
   const result = spawnSync(cmd, args, {
     encoding: 'utf8',
@@ -474,7 +490,18 @@ async function runVerify(packageSpec) {
     const stageDir = fs.mkdtempSync(path.join(os.tmpdir(), `hipp-verify-stage-`));
 
     try {
-      git(['clone', '--branch', tag, '--depth', '1', originUrl, tmpDir], { stdio: 'pipe' });
+      let cloneResult;
+      try {
+        cloneResult = git(['clone', '--branch', tag, '--depth', '1', originUrl, tmpDir], { stdio: 'pipe' });
+      } catch (cloneErr) {
+        if (originUrl.startsWith('git@')) {
+          const httpsUrl = sshToHttpsUrl(originUrl);
+          log.info(`🌿 SSH clone failed, trying HTTPS: ${httpsUrl}...`);
+          cloneResult = git(['clone', '--branch', tag, '--depth', '1', httpsUrl, tmpDir], { stdio: 'pipe' });
+        } else {
+          throw cloneErr;
+        }
+      }
 
       const clonedRevision = git(['rev-parse', 'HEAD'], { cwd: tmpDir });
       if (clonedRevision !== revision) {
@@ -650,11 +677,12 @@ async function run() {
     const revision = refInfo.head;
     const npmVersion = runCmd('npm', ['--version']).stdout.trim();
     const nodeVersion = process.version;
-    const dataToSign = buildSignData(tarballHash, provenance.remoteUrl, rawTag, revision, name, email);
+    const originUrl = provenance.remoteUrl;
+    const dataToSign = buildSignData(tarballHash, originUrl, rawTag, revision, name, email);
     const signature = signContent(dataToSign, privateKey);
 
     const manifestJson = {
-      origin: provenance.remoteUrl,
+      origin: originUrl,
       tag: rawTag,
       revision: revision,
       hash: tarballHash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dk/hipp",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "High Integrity Package Publisher",
   "main": "hipp.js",
   "bin": {