Update search to use flow library api

Author: knolleary

lib/commands/search.js

@@ -15,48 +15,43 @@
  **/
 
 var httpRequest = require("request");
+
 var when = require("when");
-var defaultUrl = 'https://registry.npmjs.org/-/v1/search?text=keywords:node-red';
 
 function command(argv,result) {
     var module = argv._[1];
-
     if (!module) {
         return result.help(command);
     }
-    
+
     var options = {
         method: "GET",
-        url: defaultUrl,
+        url: 'https://flows.nodered.org/things?format=json&per_page=50&type=node&term='+module,
         headers: {
             'Accept': 'application/json',
         }
     };
-
     return when.promise(function(resolve) {
-        options.url = defaultUrl + '+' + module;
         httpRequest.get(options, function(error, response, body) {
             if (!error && response.statusCode == 200) {
-                var objectsInfo = (JSON.parse(body));
-                var filter = new RegExp(module);
-                var found = false;
-                result.log('total: ' + objectsInfo.total + ' objects: ' + objectsInfo.objects.length + ' found');
-                var objectsEntry = {};
-                for (var i = 0; i < objectsInfo.objects.length; i++) {
-                    objectsEntry = objectsInfo.objects[i];
-                    if(objectsEntry && objectsEntry.package) {
-                        result.log(objectsEntry.package.name);
-                        if (!filter ||
-                            filter.test(objectsEntry.package.name) ||
-                            filter.test(objectsEntry.package.description) ||
-                            filter.test(objectsEntry.package.keywords)) {
-
-                            result.log((objectsEntry.package.name).cyan.bold + (" - " + objectsEntry.package.keywords).grey);
-                            found = true;
-                        }
+                var info = JSON.parse(body);
+                var matches = [];
+                if (info.data && info.data.length > 0) {
+                    for (var i = 0; i < info.data.length; i++) {
+                        var n = info.data[i];
+                        var label = info.data[i].name.cyan.bold + (" - " + info.data[i].description).grey;
+                        var index = label.indexOf(module);
+                        matches.push({
+                            label: label,
+                            index: index===-1?1000:index
+                        });
                     }
-                }
-                if (!found) {
+                    matches.sort(function(A,B) { return A.index - B.index; });
+                    matches.forEach(function(m) {
+                        result.log(m.label);
+                    });
+
+                } else {
                     result.log("No results found");
                 }
             } else if (error) {

test/lib/commands/search_spec.js

@@ -30,66 +30,65 @@ describe("commands/install", function() {
         }
         result.reset();
     });
-    
+
     it('reports no results when none match',function(done) {
-        sinon.stub(httpRequest,"get").yields(null,{statusCode:200},JSON.stringify({"objects":[],"total":0,"time":"Thu Feb 27 2020 11:27:22 GMT+0000 (UTC)"}));
-        
+        sinon.stub(httpRequest,"get").yields(null,{statusCode:200},JSON.stringify({"data":[]} ));
+
         command({_:[null,"testnode"]},result).then(function() {
-            result.log.called.should.be.true;
-            result.log.args[0][0].should.eql("total: 0 objects: 0 found");
-            result.log.args[1][0].should.eql("No results found");
+            result.log.called.should.be.true();
+            result.log.args[0][0].should.eql("No results found");
             done();
         }).otherwise(done);
-            
+
     });
-    it('lists matched modules',function(done) {
+    it('lists results ordered by relevance',function(done) {
         sinon.stub(httpRequest,"get").yields(null,{statusCode:200},
             JSON.stringify({
-                "objects":[
-                    { "package":{"name": "testnode", "description": "a random node", "keywords":["testnode", "node-red", "test"]} },
-                    { "package":{"name": "testnodes", "description": "a random nodes test", "keywords":["testnodes", "node-red", "tests"]} }
-                ],
-                "total":2,
-                "time":"Thu Feb 27 2020 11:27:22 GMT+0000 (UTC)"
+                "data":[
+                    { "name":"another-node", "description":"a testnode - THREE" },
+                    { "name":"testnode", "description":"a test node - ONE" },
+                    { "name":"@scoped/testnode", "description":"once more - TWO" }
+                ]
                 })
         );
-        
+
         command({_:[null,"testnode"]},result).then(function() {
-            result.log.calledTwice.should.be.true;
-            /testnode/.test(result.log.args[0][0]).should.be.true;
-            /testnode/.test(result.log.args[1][0]).should.be.true;
+            result.log.args.length.should.equal(3);
+            /ONE/.test(result.log.args[0][0]).should.be.true();
+            /TWO/.test(result.log.args[1][0]).should.be.true();
+            /THREE/.test(result.log.args[2][0]).should.be.true();
             done();
         }).otherwise(done);
-            
+
     });
-    
+
     it('reports error response',function(done) {
         sinon.stub(httpRequest,"get").yields("testError",{statusCode:200},JSON.stringify({rows:[]}));
-        
+
         command({_:[null,"testnode"]},result).then(function() {
             result.log.called.should.be.false;
-            result.warn.called.should.be.true;
+            result.warn.called.should.be.true();
             result.warn.args[0][0].should.eql("testError");
             done();
         }).otherwise(done);
-            
+
     });
-    
+
     it('reports unexpected http response',function(done) {
         sinon.stub(httpRequest,"get").yields(null,{statusCode:101},"testError");
-        
+
         command({_:[null,"testnode"]},result).then(function() {
             result.log.called.should.be.false;
-            result.warn.called.should.be.true;
+            result.warn.called.should.be.true();
             result.warn.args[0][0].should.eql("101: testError");
             done();
         }).otherwise(done);
     });
-    
+
     it('displays command help if node not specified', function(done) {
         command({_:{}},result);
-        result.help.called.should.be.true;
+        result.help.called.should.be.true();
         done();
     });
-    
+
 });