@steedos/service-package-registry 3.0.1 → 3.0.2-beta.11

package/main/default/manager/npm_login.js

@@ -1,45 +1,6 @@
-var RegClient = require('npm-registry-client');
-function noop() { }
-var client = new RegClient({
-    log: {
-        error: noop,
-        warn: noop,
-        info: noop,
-        verbose: noop,
-        silly: noop,
-        http: noop,
-        pause: noop,
-        resume: noop
-    }
-});
-
-var fs = require('fs');
-var path = require('path');
-
-// jshint freeze:false
-if (!Array.prototype.findIndex) {
-    Array.prototype.findIndex = function (predicate) {
-        if (this === null) {
-            throw new TypeError('Array.prototype.findIndex called on null or undefined');
-        }
-        if (typeof predicate !== 'function') {
-            throw new TypeError('predicate must be a function');
-        }
-        var list = Object(this);
-        var length = list.length >>> 0;
-        var thisArg = arguments[1];
-        var value;
-
-        for (var i = 0; i < length; i++) {
-            value = list[i];
-            if (predicate.call(thisArg, value, i, list)) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-// jshint freeze:true
+const fetch = require('npm-registry-fetch');
+const fs = require('fs');
+const path = require('path');
 
 function removeSuffix(pattern, suffix) {
     if (pattern.endsWith(suffix)) {
@@ -68,75 +29,73 @@ module.exports = {
         return args;
     },
 
-    login: function (args, callback) {
-        client.adduser(args.registry, {
-            auth: {
-                username: args.user,
+    /**
+     * 使用 npm-registry-fetch 自行实现 adduser
+     */
+    login: async function (args, callback) {
+        try {
+            const url = `${args.registry}/-/user/org.couchdb.user:${args.user}`;
+            const body = {
+                name: args.user,
                 password: args.pass,
                 email: args.email
-            }
-        }, function (err, data) {
-            if (err) {
-                return callback(err);
-            }
+            };
+
+            const res = await fetch(url, {
+                method: 'PUT',
+                body,
+                headers: { 'content-type': 'application/json' },
+                // 保证兼容私库需要 basic auth
+                auth: {
+                    username: args.user,
+                    password: args.pass
+                }
+            });
+
+            const data = await res.json();
             return callback(null, data);
-        });
+        } catch (err) {
+            return callback(err);
+        }
     },
 
     readFile: function (args, callback) {
         fs.readFile(args.configPath, 'utf-8', function (err, contents) {
-            if (err) {
-                contents = '';
-            }
+            if (err) contents = '';
             return callback(null, contents);
         });
     },
 
     generateFileContents: function (args, contents, response) {
-        // `contents` holds the initial content of the NPMRC file
-        // Convert the file contents into an array
         var lines = contents ? contents.split('\n') : [];
-        // Regex pattern to detect end of registry
+
         const registryEndRegexPattern = /\:\//;
-        if (args.scope !== undefined) {
-            var scopeWrite = lines.findIndex(function (element) {
-                if (element.indexOf(args.scope + ':registry=' + args.registry) !== -1) {
-                    // If an entry for the scope is found, replace it
-                    element = args.scope + ':registry=' + args.registry;
-                    return true;
-                }
-            });
 
-            // If no entry for the scope is found, add one
-            if (scopeWrite === -1) {
-                lines.push(args.scope + ':registry=' + args.registry);
+        if (args.scope !== undefined) {
+            const scopeLine = `${args.scope}:registry=${args.registry}`;
+            const index = lines.findIndex(l => l.startsWith(`${args.scope}:registry=`));
+            if (index === -1) {
+                lines.push(scopeLine);
+            } else {
+                lines[index] = scopeLine;
             }
         }
 
-        var authWrite = lines.findIndex(function (element, index, array) {
-            if (element.indexOf(args.registry.slice(args.registry.search(registryEndRegexPattern, '') + 1) +
-                '/:_authToken=') !== -1) {
-                // If an entry for the auth token is found, replace it
-                array[index] = element.replace(/authToken\=.*/, 'authToken=' + (args.quotes ? '"' : '') +
-                    response.token + (args.quotes ? '"' : ''));
-                return true;
-            }
-        });
+        const regPath = args.registry.slice(args.registry.search(registryEndRegexPattern, '') + 1);
+        const tokenLinePattern = `${regPath}/:_authToken=`;
 
-        // If no entry for the auth token is found, add one
-        if (authWrite === -1) {
-            lines.push(args.registry.slice(args.registry.search(registryEndRegexPattern, '') +
-                1) + '/:_authToken=' + (args.quotes ? '"' : '') + response.token + (args.quotes ? '"' : ''));
-        }
+        const tokenLine = tokenLinePattern + (args.quotes ? '"' : '') +
+            response.token + (args.quotes ? '"' : '');
 
-        var toWrite = lines.filter(function (element) {
-            if (element === '') {
-                return false;
-            }
-            return true;
-        });
+        const tokenIndex = lines.findIndex(l => l.includes(tokenLinePattern));
+        if (tokenIndex === -1) {
+            lines.push(tokenLine);
+        } else {
+            lines[tokenIndex] = tokenLine;
+        }
 
-        return toWrite;
+        // 清理空行
+        return lines.filter(l => l.trim() !== '');
     },
 
     writeFile: function (args, lines, callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-package-registry",
-  "version": "3.0.1",
+  "version": "3.0.2-beta.11",
   "description": "",
   "main": "package.service.js",
   "scripts": {
@@ -9,20 +9,20 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "3.0.1",
-    "@steedos/metadata-core": "3.0.1",
-    "@steedos/objectql": "3.0.1",
-    "@steedos/service-package-loader": "3.0.1",
+    "@steedos/auth": "3.0.2-beta.11",
+    "@steedos/metadata-core": "3.0.2-beta.11",
+    "@steedos/objectql": "3.0.2-beta.11",
+    "@steedos/service-package-loader": "3.0.2-beta.11",
     "clone": "^2.1.2",
     "fs-extra": "8.1.0",
     "i18next": "20.3.2",
     "json-stringify-safe": "5.0.1",
-    "jsonata": "1.8.5",
+    "jsonata": "1.8.7",
     "lodash": "^4.17.21",
     "lodash.clonedeep": "^4.5.0",
-    "moment-timezone": "0.5.33",
+    "moment-timezone": "0.5.35",
     "npm-package-arg": "~9.1.0",
-    "npm-registry-client": "8.6.0",
+    "npm-registry-fetch": "^19.1.1",
     "package-json": "^7.0.0",
     "radwag-mass": "~1.0.5",
     "validator": "^13.5.2"
@@ -30,5 +30,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4bbcc1f1ba098d299f5c363e67679f001f715575"
+  "gitHead": "6355c86ba1122cc8e44065d74a010e3e2dfffc9f"
 }