@btc-vision/cli 1.0.6 → 1.0.7

package/build/index.js

@@ -50,10 +50,9 @@ program.addCommand(searchCommand);
 program.showHelpAfterError();
 program.showSuggestionAfterError();
 program.exitOverride((err) => {
-    if (err.code === 'commander.help') {
-        process.exit(0);
-    }
-    if (err.code === 'commander.version') {
+    if (err.code === 'commander.help' ||
+        err.code === 'commander.helpDisplayed' ||
+        err.code === 'commander.version') {
         process.exit(0);
     }
     logger.error(`Error: ${err.message}`);

package/build/lib/config.js

@@ -11,12 +11,7 @@ export const DEFAULT_CONFIG = {
         regtest: 'https://regtest.opnet.org',
     },
     ipfsGateway: 'https://ipfs.opnet.org/ipfs/',
-    ipfsGateways: [
-        'https://ipfs.opnet.org/ipfs/',
-        'https://ipfs.io/ipfs/',
-        'https://cloudflare-ipfs.com/ipfs/',
-        'https://dweb.link/ipfs/',
-    ],
+    ipfsGateways: ['https://ipfs.opnet.org/ipfs/'],
     ipfsPinningEndpoint: 'https://ipfs.opnet.org/api/v0/add',
     ipfsPinningApiKey: '',
     ipfsPinningSecret: '',

package/build/lib/ipfs.d.ts

@@ -12,5 +12,3 @@ export declare function buildGatewayUrl(gateway: string, cid: string): string;
 export declare function isValidCid(cid: string): boolean;
 export declare function downloadPlugin(cid: string, outputPath: string): Promise<number>;
 export declare function uploadPlugin(filePath: string): Promise<PinResult>;
-export declare function checkAvailability(cid: string): Promise<boolean>;
-export declare function getGatewayStatus(): Promise<Record<string, boolean>>;

package/build/lib/ipfs.js

@@ -2,7 +2,13 @@ import * as https from 'https';
 import * as http from 'http';
 import * as fs from 'fs';
 import { loadConfig } from './config.js';
-async function httpRequest(url, options) {
+const DEFAULT_MAX_REDIRECTS = 10;
+async function httpRequest(url, options, redirectCount = 0) {
+    const maxRedirects = options.maxRedirects ?? DEFAULT_MAX_REDIRECTS;
+    const followRedirect = options.followRedirect ?? false;
+    if (redirectCount > maxRedirects) {
+        throw new Error(`Maximum redirects (${maxRedirects}) exceeded`);
+    }
     return new Promise((resolve, reject) => {
         const parsedUrl = new URL(url);
         const isHttps = parsedUrl.protocol === 'https:';
@@ -16,17 +22,28 @@ async function httpRequest(url, options) {
             timeout: options.timeout || 30000,
         };
         const req = lib.request(reqOptions, (res) => {
+            const statusCode = res.statusCode ?? 0;
+            if (followRedirect && statusCode >= 300 && statusCode < 400 && res.headers.location) {
+                const redirectUrl = new URL(res.headers.location, url).href;
+                res.resume();
+                httpRequest(redirectUrl, options, redirectCount + 1)
+                    .then(resolve)
+                    .catch(reject);
+                return;
+            }
             const chunks = [];
             res.on('data', (chunk) => {
                 chunks.push(chunk);
             });
             res.on('end', () => {
                 const body = Buffer.concat(chunks);
-                if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+                if (statusCode >= 200 && statusCode < 300) {
                     resolve(body);
                 }
                 else {
-                    reject(new Error(`HTTP ${res.statusCode}: ${res.statusMessage} - ${body.toString()}`));
+                    const bodyStr = body.toString().slice(0, 200);
+                    const truncated = body.length > 200 ? '...' : '';
+                    reject(new Error(`HTTP ${statusCode}: ${res.statusMessage}${bodyStr ? ` - ${bodyStr}${truncated}` : ''}`));
                 }
             });
         });
@@ -104,6 +121,7 @@ export async function pinToIPFS(data, name) {
             headers,
             body,
             timeout: 120000,
+            followRedirect: true,
         });
         const result = JSON.parse(response.toString());
         let cid;
@@ -140,8 +158,13 @@ export async function fetchFromIPFS(cid) {
         try {
             const url = buildGatewayUrl(gateway, cid);
             const data = await httpRequest(url, {
+                headers: {
+                    Accept: 'application/octet-stream',
+                    'User-Agent': 'OPNet-CLI/1.0',
+                },
                 method: 'GET',
                 timeout: 60000,
+                followRedirect: true,
             });
             return {
                 data,
@@ -159,6 +182,9 @@ export function buildGatewayUrl(gateway, cid) {
     if (base.includes('{cid}')) {
         return base.replace('{cid}', cid);
     }
+    else if (base.endsWith('/ipfs')) {
+        return `${base}/${cid}`;
+    }
     else if (base.includes('/ipfs/')) {
         return `${base}${cid}`;
     }
@@ -188,32 +214,3 @@ export async function uploadPlugin(filePath) {
     const fileName = filePath.split('/').pop() || 'plugin.opnet';
     return pinToIPFS(data, fileName);
 }
-export async function checkAvailability(cid) {
-    try {
-        await fetchFromIPFS(cid);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-export async function getGatewayStatus() {
-    const config = loadConfig();
-    const gateways = config.ipfsGateways.length > 0 ? config.ipfsGateways : [config.ipfsGateway];
-    const testCid = 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn';
-    const status = {};
-    await Promise.all(gateways.map(async (gateway) => {
-        try {
-            const url = buildGatewayUrl(gateway, testCid);
-            await httpRequest(url, {
-                method: 'HEAD',
-                timeout: 10000,
-            });
-            status[gateway] = true;
-        }
-        catch {
-            status[gateway] = false;
-        }
-    }));
-    return status;
-}

package/build/lib/wallet.js

@@ -82,7 +82,7 @@ export class CLIWallet {
         const securityLevel = getMLDSASecurityLevel(level);
         const dummyChainCode = new Uint8Array(32);
         const keypair = QuantumBIP32Factory.fromPublicKey(publicKey, dummyChainCode, networks.bitcoin, securityLevel);
-        return keypair.verify(data, signature);
+        return MessageSigner.verifyMLDSASignature(keypair, data, signature);
     }
     signMLDSA(data) {
         const result = MessageSigner.signMLDSAMessage(this.wallet.mldsaKeypair, data);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@btc-vision/cli",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "type": "module",
     "description": "CLI for the OPNet plugin ecosystem - scaffolding, compilation, signing, and registry interaction",
     "author": "OP_NET",