@ntlab/sipd-agr 3.3.0 → 3.5.0

package/app/configuration.js

@@ -44,6 +44,16 @@ Cmd.addBool('help', '', 'Show program usage', false);
  */
 class Configuration {
 
+    defaults = {
+        mode: Sipd.DOWNLOAD,
+        url: 'https://sipd-ri.kemendagri.go.id',
+        year: new Date().getFullYear(),
+        username: null,
+        password: null,
+        dir: null,
+        skipDownload: ['no-download', false],
+    }
+
     /**
      * Constructor.
      *
@@ -55,25 +65,13 @@ class Configuration {
         if (fs.existsSync(filename)) {
             Object.assign(this, this.getConfig(filename));
         }
-        for (const a of ['url', 'username', 'password', 'year', 'dir']) {
-            const v = Cmd.get(a);
-            if (v) {
-                this[a] = v;
-            }
-        }
         if (fs.existsSync(filename)) {
             console.log('Configuration loaded from %s', filename);
         }
         if (!this.workdir) {
             this.workdir = rootDir;
         }
-        if (Cmd.get('no-download')) {
-            this.skipDownload = Cmd.get('no-download');
-        }
-        if (!this.mode) {
-            this.mode = Cmd.get('mode') ? Cmd.get('mode') : Sipd.DOWNLOAD;
-        }
-
+        this.checkDefaults();
         if (!this.username || !this.password) {
             console.log('Both username or password must be supplied!');
             return;
@@ -103,6 +101,22 @@ class Configuration {
         this.initialized = true;
     }
 
+    checkDefaults() {
+        for (const [k, v] of Object.entries(this.defaults)) {
+            const opt = Array.isArray(v) ? v[0] : k;
+            const defval = Array.isArray(v) ? v[1] : v;
+            // get value from command options
+            let value = Cmd.get(opt);
+            // fallback to default
+            if (value === null) {
+                value = defval;
+            }
+            if (value !== undefined && value !== null) {
+                this[k] = value;
+            }
+        }
+    }
+
     getConfig(filename) {
         let config = JSON.parse(fs.readFileSync(filename));
         if (config.ref) {

package/config/default.json

@@ -1,7 +1,5 @@
 {
-    "url":"https://sipd-ri.kemendagri.go.id",
     "provinsi":"CHANGEME",
     "username":"CHANGEME",
-    "password":"CHANGEME",
-    "year":"2025"
+    "password":"CHANGEME"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ntlab/sipd-agr",
-  "version": "3.3.0",
+  "version": "3.5.0",
   "description": "SIPD RI Kemendagri Automation is a web automation using Selenium to help manage data such as budgeting download",
   "main": "main.js",
   "author": "Toha <tohenk@yahoo.com>",

package/sipd/index.js

@@ -27,6 +27,7 @@ const Queue = require('@ntlab/work/queue');
 const SipdApp = require('./modules/app');
 const SipdSubkeg = require('./modules/subkeg');
 const SipdRefs = require('./modules/refs');
+const { By, error } = require('selenium-webdriver');
 const debug = require('debug')('sipdagr:core');
 
 class Sipd extends WebRobot {
@@ -45,6 +46,7 @@ class Sipd extends WebRobot {
         this.app = new SipdApp(this);
         this.subkeg = new SipdSubkeg(this);
         this.refs = new SipdRefs(this);
+        super.constructor.expectErr(error.StaleElementReferenceError);
     }
 
     getWorks() {
@@ -197,19 +199,28 @@ class Sipd extends WebRobot {
         }
         return new Promise((resolve, reject) => {
             let el, presence = false;
+            let target;
+            if (data.data instanceof By) {
+                target = data.data.value;
+            } else if (data instanceof By) {
+                target = data.value;
+            } else {
+                target = data;
+            }
             const t = Date.now();
             const f = () => {
                 this.works([
-                    [w => this.findElements(data)],
+                    [w => this.isStale(data.el), w => data.el],
+                    [w => this.findElements(data), w => !w.getRes(0)],
                     [w => new Promise((resolve, reject) => {
                         let wait = true;
                         if (options.mode === this.WAIT_GONE && presence && w.res.length === 0) {
-                            debug(`element now is gone: ${data}`);
+                            debug(`element ${target} now is gone`);
                             el = w.res[0];
                             wait = false;
                         }
                         if (options.mode === this.WAIT_PRESENCE && !presence && w.res.length === 1) {
-                            debug(`element now is presence: ${data}`);
+                            debug(`element ${target} now is presence`);
                             el = w.res[0];
                             wait = false;
                         }
@@ -221,17 +232,25 @@ class Sipd extends WebRobot {
                             wait = false;
                         }
                         resolve(wait);
-                    })],
+                    }), w => !w.getRes(0)],
+                    [w => Promise.resolve(false), w => w.getRes(0)],
                 ])
                 .then(result => {
                     if (result) {
-                        debug(`still waiting for ${options.mode === this.WAIT_GONE ? 'gone' : 'presence'}: ${data}`);
-                        setTimeout(f, !presence ? 250 : 500);
+                        debug(`still waiting ${target} to be ${options.mode === this.WAIT_GONE ? 'gone' : 'presence'}`);
+                        setTimeout(f, 50);
                     } else {
                         resolve(el);
                     }
                 })
-                .catch(err => reject(err));
+                .catch(err => {
+                    if (err instanceof error.StaleElementReferenceError) {
+                        debug(`stale on ${target}, resolving instead`);
+                        resolve(el);
+                    } else {
+                        reject(err);
+                    }
+                });
             }
             f();
         });

package/sipd/modules/app.js

@@ -58,6 +58,7 @@ class SipdApp {
                 By.xpath('//button[@type="submit"]')
             ), w => w.getRes(0).length],
             [w => this.waitCaptcha(), w => w.getRes(0).length],
+            [w => this.owner.waitForPresence({el: w.getRes(3), data: By.xpath('.//*[@class="indicator-progress"]')}, {mode: this.owner.WAIT_GONE}), w => w.getRes(0).length],
             [w => this.owner.sleep(this.owner.opdelay), w => w.getRes(0).length],
         ]);
     }
@@ -135,8 +136,6 @@ class SipdApp {
                 w => w.getRes(0)],
             [w => this.owner.click(By.xpath('//ngx-captcha/div/div/input[@type="button"]')),
                 w => w.getRes(0)],
-            [w => this.owner.sleep(this.owner.opdelay),
-                w => w.getRes(0)],
             [w => Promise.resolve(w.getRes(0))],
         ]);
     }
@@ -144,7 +143,7 @@ class SipdApp {
     waitSolvedCaptcha() {
         return this.owner.works([
             [w => Promise.resolve(this.owner.app.showMessage('Captcha', 'Please solve the captcha first!'))],
-            [w => this.owner.waitForPresence(By.xpath('//ngx-captcha'))],
+            [w => this.owner.waitForPresence(By.xpath('//ngx-captcha'), {mode: this.owner.WAIT_GONE})],
             [w => Promise.resolve(console.log('Captcha is solved!'))],
         ]);
     }