pxnpm 2.0.7 → 3.0.0-1

package/{LICENSE.txt → LICENSE}

@@ -1,6 +1,6 @@
-This software is licensed under the MIT License.
+MIT License
 
-Copyright (C) cnpmjs.org and other contributors.
+Copyright (c) 2013-present pxnpm and other contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/bin/cnpm-check

@@ -2,54 +2,37 @@
 
 'use strict';
 
-var path = require('path');
-var urllib = require('urllib');
-var colors = require('colors');
-var config = require('../lib/config');
-var parseArgv = require('../lib/parse_argv');
-
-var program = parseArgv();
-var args = program.args;
-
-var pkg = require(path.join(process.cwd(), 'package.json'));
-
-function checkUpdate() {
-  var names = Object.keys(pkg.dependencies);
-  var next = function () {
-    var name = names.shift();
-    if (!name) {
-      return process.exit(0);
-    }
-    var url = config.cnpmRegistry + '/' + name + '/latest';
-    urllib.request(url, {headers: {'user-agent': 'cnpm-check'}},
-    function (err, result) {
-      var errmsg = '';
-      if (err) {
-        errmsg = err.message;
-      } else {
-        try {
-          result = JSON.parse(result);
-        } catch (e) {
-          errmsg = 'parse origin package info error. ' + err.message;
-          result = {};
-        }
-      }
-      if (errmsg) {
-        console.log('[' + name.red + '] check version error: ' + err.message.red);
-        return next();
-      }
-
-      var localVersion = String(pkg.dependencies[name] || '*');
-      var localVersionCheck = localVersion.replace(/^[^\.\d]+/g, '');
-      var remoteVersion = result && result.version || 'unknow';
-      if (remoteVersion !== localVersionCheck) {
-        console.log('[' + name.yellow + '] new version: ' + remoteVersion.green + ', local version: ' + localVersion.yellow);
-      }
-      next();
+const path = require('path');
+const urllib = require('urllib');
+const config = require('../lib/config');
+
+const pkg = require(path.join(process.cwd(), 'package.json'));
+
+async function checkOnePackage(name) {
+  const url = config.cnpmRegistry + '/' + name + '/latest';
+  try {
+    const response = await urllib.request(url, {
+      headers: { 'user-agent': 'pxnpm-check' },
+      dataType: 'json',
     });
-  };
+    const result = response.data;
+    const localVersion = String(pkg.dependencies[name] || '*');
+    const localVersionCheck = localVersion.replace(/^[^\.\d]+/g, '');
+    const remoteVersion = result && result.version || 'unknow';
+    if (remoteVersion !== localVersionCheck) {
+      console.log('[' + name + '] new version: ' + remoteVersion + ', local version: ' + localVersion);
+    }
+  } catch (err) {
+    console.error(err);
+    console.log('[' + name + '] check version error: ' + err.message);
+  }
+}
 
-  next();
+async function checkUpdate() {
+  const names = Object.keys(pkg.dependencies);
+  for (const name of names) {
+    await checkOnePackage(name);
+  }
 }
 
 checkUpdate();

package/bin/cnpm-doc

@@ -2,43 +2,45 @@
 
 'use strict';
 
-var request = require('npm-request');
-var giturl = require('giturl');
-var utils = require('../lib/utils');
-var argv = require('../lib/parse_argv')('doc');
-var pkgName = argv.args[1];
-var docurl = argv.registryweb + '/package/' + pkgName;
+const request = require('npm-request');
+const giturl = require('giturl');
+const utils = require('../lib/utils');
+const argv = require('../lib/parse_argv')('doc');
+const pkgName = argv.args[1];
+const docurl = argv.registryweb + '/package/' + pkgName;
 
 if (!pkgName) {
-  return argv.help();
+  argv.help();
+  process.exit(0);
 }
 
 if (!argv.git) {
-  return utils.openurl(docurl);
+  utils.openurl(docurl);
+  process.exit(0);
 }
 
 console.log('getting "%s" package info...', pkgName);
 request({
   method: 'GET',
-  path: pkgName + '/latest'
+  path: pkgName + '/latest',
 }, {
-  registry: argv.registry
-}, function (err, info) {
+  registry: argv.registry,
+}, function(err, info) {
   if (err) {
     console.error(err);
     process.exit(-1);
   }
 
   if (!info.name) {
-    console.log('"%s" package not exists', name);
+    console.log('"%s" package not exists', pkgName);
     process.exit(0);
   }
 
-  var repository = info.repository;
+  const repository = info.repository;
   if (!repository || !repository.url) {
     return utils.openurl(docurl);
   }
 
-  var url = giturl.parse(repository.url) || docurl;
+  const url = giturl.parse(repository.url) || docurl;
   utils.openurl(url);
 });

package/bin/cnpm-sync

@@ -2,38 +2,37 @@
 
 'use strict';
 
-var path = require('path');
-var Bagpipe = require('bagpipe');
-var fs = require('fs');
-var querystring = require('querystring');
-var request = require('npm-request');
-var config = require('../lib/config');
-var argv = require('../lib/parse_argv')('sync');
+const path = require('path');
+const Bagpipe = require('bagpipe');
+const fs = require('fs');
+const querystring = require('querystring');
+const request = require('npm-request');
+const argv = require('../lib/parse_argv')('sync');
 
-var args = argv.args;
-var registrys = [argv.registry];
-var registrywebs = {};
+const args = argv.args;
+const registrys = [ argv.registry ];
+const registrywebs = {};
 registrywebs[argv.registry] = argv.registryweb;
 
-var nodeps = argv.deps ? false: true;
-var publish = argv.syncPublish ? true : false;
+const nodeps = !argv.deps;
+const publish = !!argv.syncPublish;
 
-var names = args.slice(1);
-var packageName;
-var dependencies = [];
-var isPrivate = false;
+const names = args.slice(1);
+let packageName;
+let dependencies = [];
+let isPrivate = false;
 
-var packagePath = path.join(process.cwd(), 'package.json');
+const packagePath = path.join(process.cwd(), 'package.json');
 if (!names.length && fs.existsSync(packagePath)) {
   try {
     console.log('Parse `package.json` file now...');
-    var pkg = require(packagePath);
+    const pkg = require(packagePath);
     packageName = pkg.name;
-    var dependenciesMap = {};
-    for (var key in (pkg.dependencies || {})) {
+    const dependenciesMap = {};
+    for (const key in (pkg.dependencies || {})) {
       dependenciesMap[key] = pkg.dependencies[key];
     }
-    for (var key in (pkg.devDependencies || {})) {
+    for (const key in (pkg.devDependencies || {})) {
       dependenciesMap[key] = pkg.devDependencies[key];
     }
     dependencies = Object.keys(dependenciesMap);
@@ -49,34 +48,28 @@ if (names && names.length) {
 } else if (packageName) {
   syncByPackage(packageName);
 } else {
-  console.log('Usage: $ cnpm sync [moduleName1 moduleName2 ...]\n\n\
-Options:\n\
-  --publish        sync as publish\n\
-  --no-deps        do not sync dependencies and devDependencies\n');
+  console.log(`Usage: $ cnpm sync [moduleName1 moduleName2 ...]
+Options:
+  --publish        sync as publish
+  --no-deps        do not sync dependencies and devDependencies`);
   process.exit(1);
 }
 
-// var syncInfo = {};
-// var NPM_OPTIONS = {
-//   registry: registry,
-//   configFile: argv.userconfig
-// };
-
 function showlog(registry, syncInfo, done) {
   request({
     method: 'GET',
-    path: syncInfo.logurl + '?offset=' + syncInfo.lastLines
+    path: syncInfo.logurl + '?offset=' + syncInfo.lastLines,
   }, {
-    registry: registry,
-    configFile: argv.userconfig
-  }, function (err, info) {
+    registry,
+    configFile: argv.userconfig,
+  }, function(err, info) {
     if (err) {
       return done(err);
     }
     if (!info || !info.log) {
       return setTimeout(showlog.bind(null, registry, syncInfo, done), 2000);
     }
-    var log = info.log.trim();
+    const log = info.log.trim();
     console.log(log);
     syncInfo.lastLines += log.split('\n').length;
     if (log.indexOf('[done] Sync ' + syncInfo.name) >= 0) {
@@ -88,20 +81,20 @@ function showlog(registry, syncInfo, done) {
 }
 
 function sync(registry, name, callback) {
-  var url = name + '/sync?';
+  let url = name + '/sync?';
   url += querystring.stringify({
-    publish: publish,
-    nodeps: nodeps,
+    publish,
+    nodeps,
   });
   console.log('sync %s, PUT %s/%s', name, registry, url);
   request({
     method: 'PUT',
     path: url,
-    data: {}
+    data: {},
   }, {
-    registry: registry,
-    configFile: argv.userconfig
-  }, function (err, result, data, res) {
+    registry,
+    configFile: argv.userconfig,
+  }, function(err, result, data, res) {
     if (err) {
       return callback(err);
     }
@@ -112,38 +105,38 @@ function sync(registry, name, callback) {
       return callback(null, {
         ok: false,
         statusCode: res.statusCode,
-        result: result,
-        data: data
+        result,
+        data,
       });
     }
-    var syncInfo = {
-      name: name,
+    const syncInfo = {
+      name,
       lastLines: 0,
-      logurl: name + '/sync/log/' + result.logId
+      logurl: name + '/sync/log/' + result.logId,
     };
-    console.log('logurl: %s/sync/%s#logid=%d', registrywebs[registry], name, result.logId);
-    showlog(registry, syncInfo, function (err) {
+    console.log('logurl: %s/sync/%s#logid=%s', registrywebs[registry], name, result.logId);
+    showlog(registry, syncInfo, function(err) {
       if (err) {
         return callback(err);
       }
-      callback(null, {ok: true});
+      callback(null, { ok: true });
     });
   });
 }
 
 function syncByNames(names) {
-  var queue = new Bagpipe(1);
-  var remain = names.length * registrys.length;
+  const queue = new Bagpipe(1);
+  let remain = names.length * registrys.length;
   if (!names) {
     console.log('Can not find any packages to sync.');
     process.exit(0);
   }
   console.log('Start sync %j.', names);
-  var fail = {};
-  var success = {};
-  registrys.forEach(function (registry) {
-    names.forEach(function (name) {
-      queue.push(sync, registry, name, function (err, data) {
+  const fail = {};
+  const success = {};
+  registrys.forEach(function(registry) {
+    names.forEach(function(name) {
+      queue.push(sync, registry, name, function(err, data) {
         remain--;
         if (err) {
           console.error(err.message);
@@ -154,7 +147,7 @@ function syncByNames(names) {
           success[name] = true;
         }
         if (!remain) {
-          for (var n in success) {
+          for (const n in success) {
             if (fail[n]) {
               delete success[n];
             }
@@ -178,5 +171,5 @@ function syncByPackage(packageName) {
     return syncByNames(dependencies);
   }
 
-  syncByNames([packageName]);
+  syncByNames([ packageName ]);
 }

package/bin/cnpm-update

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const debug = require('debug')('pxnpm:update');
+const path = require('path');
+const { fork } = require('child_process');
+const { rmSync } = require('fs');
+
+const cwd = process.cwd();
+const cnpmCli = path.join(__dirname, 'pxnpm');
+const options = {
+  stdio: 'inherit',
+};
+
+const nodeModulesDir = path.join(cwd, 'node_modules');
+console.log('[pxnpm:update] Removing %s', nodeModulesDir);
+rmSync(nodeModulesDir, { force: true, recursive: true });
+
+console.log('[pxnpm:update] Running "pxnpm install" on %s', cwd);
+fork(cnpmCli, [ 'install' ], options)
+  .on('exit', code => {
+    debug('exit %s', code);
+    process.exit(code);
+  });
+

package/bin/pxnpm

@@ -1,9 +1,8 @@
 #!/usr/bin/env node
 
 'use strict';
-const pkg = require('../package.json');
 
-const debug = require('debug')('cnpm');
+const debug = require('debug')('pxnpm');
 const argv = require('../lib/parse_argv')();
 
 const action = argv.args[0];
@@ -15,13 +14,14 @@ const extendsMethd = {
   sync: 1,
   user: 1,
   search: 1,
+  update: 1,
 };
 
-debug('cnpm %s', action);
+debug('pxnpm %s', action);
 
 if (extendsMethd[action]) {
-  return require('./cnpm-' + action);
+  require('./pxnpm-' + action);
+} else {
+  debug('origin npm with origin registry: $ npm %s', action);
+  require('../lib/origin_npm');
 }
-
-debug('origin npm with origin registry: $ npm %s', action);
-require('../lib/origin_npm');

package/lib/config.js

@@ -1,10 +1,10 @@
-"use strict";
+'use strict';
 
-const debug = require("debug")("cnpm:config");
-const path = require("path");
-const fs = require("fs");
-const cp = require("child_process");
-const ini = require("ini");
+const debug = require('debug')('pxnpm:config');
+const path = require('path');
+const fs = require('fs');
+const cp = require('child_process');
+const ini = require('ini');
 
 try {
   fs.writeFileSync("/tmp/.pxnpm_install_status", "0", {
@@ -14,21 +14,21 @@ try {
 }
 
 let root;
-if (process.platform === "win32") {
+if (process.platform === 'win32') {
   root = process.env.USERPROFILE || process.env.APPDATA || process.env.TMP || process.env.TEMP;
 } else {
-  root = process.env.HOME || process.env.TMPDIR || "/tmp";
+  root = process.env.HOME || process.env.TMPDIR || '/tmp';
 }
 
-// let proxyC = '';
 let prefix = null;
 try {
-  prefix = cp.execSync("npm config get prefix", {timeout: 2000}).toString().trim();
+  prefix = cp.execSync('npm config get prefix', {timeout: 2000}).toString().trim();
 } catch (err) {
   // ignore it
-  // debug("npm config cli error: %s", err);
+  // debug('npm config cli error: %s', err);
 }
 
+
 // =====
 const ping = require("connection-tester");
 const rawArgs = process.argv && process.argv.slice(2);
@@ -93,6 +93,8 @@ const timeout = 3000;
 const { success: is } = ping.test(outerAddr.inner.proxy.host, outerAddr.inner.proxy.port, timeout); // registry
 const { success: os } = ping.test(outerAddr.outer.proxy.host, outerAddr.outer.proxy.port, timeout); // proxy
 
+let proxy = '';
+
 if (!is && !os) {
   // consola.fatal('没有发现安装源，请调通网络，或重新尝试安装');
   // process.exit(0);
@@ -106,20 +108,18 @@ if (!is && os) {
 
 if (is && !os) {
   addr = getAddr("inner");
-  // proxyC = 'http://rdc-lan-ningfj.inner.px.nfjbill.ren:1088'
+  proxy = addr.proxy;
 }
 
-let proxy = addr.proxy;
 let registry = addr.registry;
 
-// ====
-const userconfig = path.join(root, ".pxnpmrc");
+const userconfig = path.join(root, '.pxnpmrc');
 if (fs.existsSync(userconfig)) {
   let cnpmrc;
   try {
-    cnpmrc = ini.parse(fs.readFileSync(userconfig, "utf-8"));
+    cnpmrc = ini.parse(fs.readFileSync(userconfig, 'utf-8'));
   } catch (err) {
-    console.warn("[cnpm:config] [WARN] read %s ini format error", userconfig);
+    console.warn('[pxnpm:config] [WARN] read %s ini format error', userconfig);
   }
 
   if (cnpmrc && cnpmrc.proxy) {
@@ -127,16 +127,13 @@ if (fs.existsSync(userconfig)) {
   }
 }
 
-process.env.__pxnpm_config_proxy = proxy;
-process.env.__pxnpm_config_pxnpmServer = pxnpmServer;
-
 module.exports = {
   cnpmHost: pxnpmServer,
   cnpmRegistry: registry,
-  disturl: `${proxy}/mirrors/node`, // download dist tarball for node-gyp
-  iojsDisturl: `${proxy}/mirrors/node`,
-  cache: path.join(root, ".pxnpm"), // cache folder name
+  disturl: 'https://npmmirror.com/mirrors/node', // download dist tarball for node-gyp
+  iojsDisturl: 'https://npmmirror.com/mirrors/iojs',
+  cache: path.join(root, '.pxnpm'), // cache folder name
   userconfig,
-  proxy: '',
-  prefix
+  proxy,
+  prefix,
 };

package/lib/help.js

@@ -3,14 +3,14 @@
 const config = require('./config');
 
 module.exports = function outputHelp(argv) {
-  const helpInfo = 'Usage: cnpm [option] <command>\n' +
-  'Help: http://cnpmjs.org/help/cnpm\n\n' +
+  const helpInfo = 'Usage: pxnpm [option] <command>\n' +
+  'Help: http://cnpmjs.org/help/pxnpm\n\n' +
   '  Extend command\n' +
-  '    web                            open cnpm web (ex.: cnpm web)\n' +
-  '    check [ingoreupdate]           check project dependencies, add ignoreupdate will not check modules\' latest version(ex.: cnpm check, cnpm check -i)\n' +
-  '    doc [moduleName]               open document page (ex.: cnpm doc urllib)\n' +
-  '    sync [moduleName]              sync module from source npm (ex.: cnpm sync urllib)\n' +
-  '    user [username]                open user profile page (ex.: cnpm user fengmk2)\n' +
+  '    web                            open pxnpm web (ex.: pxnpm web)\n' +
+  '    check [ingoreupdate]           check project dependencies, add ignoreupdate will not check modules\' latest version(ex.: pxnpm check, pxnpm check -i)\n' +
+  '    doc [moduleName]               open document page (ex.: pxnpm doc egg)\n' +
+  '    sync [moduleName]              sync module from source npm (ex.: pxnpm sync egg)\n' +
+  '    user [username]                open user profile page (ex.: pxnpm user fengmk2)\n' +
   '\n' +
   '  npm command use --registry=' + (argv.registry || config.cnpmRegistry) + '\n' +
   '    where <command> is one of:\n' +

package/lib/origin_npm.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const debug = require('debug')('cnpm:origin');
+const debug = require('debug')('pxnpm:origin');
 const match = require('auto-correct');
 const spawn = require('cross-spawn');
 const cp = require('child_process');
@@ -25,7 +25,7 @@ for (let i = 0; i < rawArgs.length; i++) {
     continue;
   }
 
-  // support `$ cnpm i --by=npm`
+  // support `$ pxnpm i --by=npm`
   if (arg.indexOf('--by=') === 0) {
     installer = arg.split('=', 2)[1];
     continue;
@@ -65,7 +65,7 @@ const stdio = [
 if (isInstall) {
   npmBin = path.join(__dirname, '..', 'node_modules', '.bin', installer);
   if (installer === 'pxnpminstall') {
-    // use fork to spawn can fix install cnpm itself fail on Windows
+    // use fork to spawn can fix install pxnpm itself fail on Windows
     execMethod = cp.fork;
     stdio.push('ipc');
     npmBin = require.resolve('pxnpminstall/bin/install.js');

package/package.json

@@ -1,61 +1,75 @@
 {
   "name": "pxnpm",
-  "version": "2.0.7",
-  "description": "pxnpm use cnpm engine",
+  "version": "3.0.0-1",
+  "description": "cnpm: npm client for cnpmjs.org",
+  "preferGlobal": true,
+  "bin": {
+    "pxnpm": "bin/pxnpm"
+  },
   "main": "bin/pxnpm",
   "files": [
     "bin",
     "lib"
   ],
   "scripts": {
-    "pub": "npm version patch && npm publish",
-    "pub:beta": "npm version prerelease --preid=beta && npm publish --tag beta",
-    "test": "npm run lint -- --fix && npm run test-local",
+    "contributor": "git-contributor",
+    "test": "npm run lint && npm run test-local",
     "test-local": "egg-bin test",
-    "lint": "eslint bin lib test/*.js",
-    "ci": "npm run lint && npm run test",
-    "autod": "autod"
-  },
-  "preferGlobal": true,
-  "bin": {
-    "pxnpm": "bin/pxnpm"
+    "lint": "eslint bin/* lib test/*.test.js",
+    "ci": "npm run lint && egg-bin test"
   },
   "dependencies": {
     "auto-correct": "^1.0.0",
     "bagpipe": "^0.3.5",
-    "colors": "^1.1.2",
     "commander": "~2.10.0",
-    "config-chain": "^1.1.13",
     "connection-tester": "^0.2.1",
     "cross-spawn": "~0.2.8",
-    "debug": "^2.2.0",
+    "debug": "^4.3.4",
     "giturl": "^1.0.0",
     "ini": "^1.3.4",
-    "npm": "^6.13.4",
+    "npm": "^8.12.1",
     "npm-request": "^1.0.0",
+    "pxnpminstall": "3.0.0-0",
     "open": "^8.2.1",
-    "pxnpminstall": "2.0.2",
-    "urllib": "^2.17.0"
+    "urllib": "^3.1.0"
   },
   "devDependencies": {
-    "autod": "^2.7.1",
-    "coffee": "^3.3.0",
-    "egg-bin": "^4.7.0",
-    "egg-ci": "^1.1.0",
-    "eslint": "^4.19.1",
-    "eslint-config-egg": "^7.0.0",
-    "fs-extra": "0",
-    "rimraf": "^2.5.4"
+    "coffee": "5",
+    "egg-bin": "5",
+    "egg-ci": "2",
+    "eslint": "8",
+    "eslint-config-egg": "12",
+    "git-contributor": "1"
+  },
+  "homepage": "https://github.com/cnpm/cnpm",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/cnpm/cnpm.git"
+  },
+  "bugs": {
+    "url": "https://github.com/cnpm/cnpm/issues"
+  },
+  "keywords": [
+    "cnpm",
+    "npm",
+    "npminstall"
+  ],
+  "publishConfig": {
+    "tag": "latest"
   },
   "engines": {
-    "node": ">= 10.0.0"
+    "node": ">= 14.0.0"
   },
   "ci": {
-    "type": "github",
-    "version": "10, 12, 14, 16",
-    "os": {
-      "github": "linux, windows, macos"
+    "version": "14, 16, 18",
+    "license": {
+      "year": "2013",
+      "fullname": "cnpm and other contributors."
     }
   },
-  "license": "MIT"
+  "author": "fengmk2 <fengmk2@gmail.com> (https://github.com/fengmk2)",
+  "license": "MIT",
+  "__npminstall_done": true,
+  "_from": "cnpm@8.3.0",
+  "_resolved": "http://fe-repo.inner.px.nfjbill.ren:5507/cnpm/-/cnpm-8.3.0.tgz"
 }

package/bin/cnpm

@@ -1,27 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const debug = require('debug')('cnpm');
-const pkg = require('../package.json');
-const argv = require('../lib/parse_argv')();
-
-const action = argv.args[0];
-
-const extendsMethd = {
-  web: 1,
-  check: 1,
-  doc: 1,
-  sync: 1,
-  user: 1,
-  search: 1,
-};
-
-debug('cnpm %s', action);
-
-if (extendsMethd[action]) {
-  return require('./cnpm-' + action);
-}
-
-debug('origin npm with origin registry: $ npm %s', action);
-require('../lib/origin_npm');