@tiledesk/tiledesk-server 2.10.52 → 2.10.54

package/test/kbRoute.js

@@ -661,12 +661,12 @@ describe('KbRoute', () => {
                             chai.request(server)
                                 .post('/' + savedProject._id + '/kb/multi?namespace=' + namespace_id)
                                 .auth(email, pwd)
-                                .send({ list:["https://gethelp.tiledesk.com/article"], scrape_type: 3 })
+                                .send({ list:["https://gethelp.tiledesk.com/article"], refresh_rate: 'daily', scrape_type: 3 })
                                 .end((err, res) => {
 
                                     if (err) { console.error("err: ", err); }
                                     if (log) { console.log("res.body: ", res.body) }
-
+                                    console.log("res.body: ", res.body)
                                     res.should.have.status(200);
                                     expect(res.body.length).to.equal(1)
                                     expect(res.body[0].scrape_type).to.equal(3)
@@ -1437,6 +1437,78 @@ describe('KbRoute', () => {
 
 
 
+                });
+            });
+        }).timeout(10000)
+
+        it('webhook-reindex', (done) => {
+
+            var email = "test-signup-" + Date.now() + "@email.com";
+            var pwd = "pwd";
+
+            userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+                projectService.create("test-kb-webhook", savedUser._id).then(function (savedProject) {
+
+                    chai.request(server)
+                        .get('/' + savedProject._id + '/kb/namespace/all')
+                        .auth(email, pwd)
+                        .end((err, res) => {
+
+                            if (err) { console.log("error: ", err) };
+                            if (log) { console.log("res.body: ", res.body) };
+
+                            res.should.have.status(200);
+                            res.body.should.be.a('array');
+
+                            let namespace_id = res.body[0].id;
+
+                            let kb = {
+                                name: "example_name6",
+                                type: "url",
+                                source: "https://www.exampleurl6.com",
+                                content: "",
+                                namespace: namespace_id
+                            }
+
+                            chai.request(server)
+                                .post('/' + savedProject._id + '/kb/')
+                                .auth(email, pwd)
+                                .send(kb)
+                                .end((err, res) => {
+
+                                    if (err) { console.log("error: ", err) };
+                                    if (log) { console.log("res.body: ", res.body) };
+
+                                    res.should.have.status(200);
+                                    res.body.should.be.a('object');
+
+                                    let kb_id = res.body.value._id;
+
+                                    chai.request(server)
+                                        .post('/webhook/kb/reindex')
+                                        .set("x-auth-token", "testtoken")
+                                        .send({ content_id: kb_id })
+                                        .end((err, res) => {
+
+                                            if (err) { console.error("err: ", err) };
+                                            if (log) { console.log("res.body: ", res.body) };
+
+                                            res.should.have.status(200);
+                                            res.body.should.be.a('object');
+                                            expect(res.body.success).to.equal(true);
+                                            expect(res.body.message).to.equal("Content queued for reindexing");
+
+                                            done();
+
+                                        })
+
+
+                                })
+                        })
+
+
+
+
                 });
             });
         }).timeout(10000)

package/utils/jobs-worker-queue-manager/queueManagerClassV2.js

@@ -46,28 +46,24 @@ connect(callback) {
     amqp.connect(this.url, function(err, conn) {
       if (err) {
         // if (this.debug) {console.log("[AMQP]", err.message);
-        // if (that.debug) {console.log("[JobWorker] AMQP", err);}
-        console.error("[JobWorker] AMQP", err);
-        console.log("[JobWorker] Try to reconnect");
-
-        return setTimeout(function() {
-          that.connect()
+        console.error("[JobWorker] AMQP error", err);
+        return setTimeout(function () {
+          if (that.debug) { console.log("[JobWorker] AMQP reconnecting"); }
+          that.connect(callback)
         }, 1000);
+
       }
       conn.on("error", function(err) {
-        console.error("[JobWorker] err.message", err.message);
         if (err.message !== "Connection closing") {
-          //if (that.debug) {console.log("[JobWorker] AMQP conn error", err);}
-          console.log("[JobWorker] AMQP conn error", err)
-          if (callback) {
-            callback(null, err)
-          }
+          console.log("[JobWorker] AMQP conn error", err);
         }
       });
       conn.on("close", function() {
         // if (that.debug) {console.log("[JobWorker] AMQP reconnecting");}
         console.log("[JobWorker] AMQP reconnecting")
-        return setTimeout(that.connect, 1000);
+        return setTimeout(() => {
+          that.connect(callback);
+        }, 1000);
       });
 
       console.log("[JobWorker] AMQP connected")
@@ -101,15 +97,13 @@ whenConnected(callback) {
 
 startPublisher(callback) {
   var that = this;
-  that.amqpConn.createConfirmChannel(function(err, ch) {
+  that.amqpConn.createConfirmChannel(function (err, ch) {
     if (that.closeOnErr(err)) return;
-    ch.on("error", function(err) {
-      // if (that.debug) {console.log("[JobWorker] - startPublisher AMQP channel error", err);}
-      console.log("[JobWorker] - startPublisher AMQP channel error", err);
+    ch.on("error", function (err) {
+      if (that.debug) { console.log("[JobWorker] AMQP channel error", err); }
     });
-    ch.on("close", function() {
-      // if (that.debug) {console.log("[JobWorker] AMQP channel closed");}
-      console.log("[JobWorker] - startPublisher AMQP channel closed")
+    ch.on("close", function () {
+      if (that.debug) { console.log("[JobWorker] AMQP channel closed"); }
     });
 
     // if (this.debug) {console.log("[AMQP] pubChannel");
@@ -122,7 +116,7 @@ startPublisher(callback) {
     // }
 
     if (callback) {
-        callback(err);
+      callback(err);
     }
 
   });