@ntlab/sipd-agr 3.2.0 → 3.4.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/app/index.js

@@ -66,20 +66,26 @@ class App {
         }
         const works = sipd.getWorks();
         if (works) {
-            sipd.works(works, next => {
-                setTimeout(() => next(), 500);
-            }).then(() => {
+            sipd.works(works, {
+                callback(next) {
+                    setTimeout(() => next(), 500);
+                }
+            })
+            .then(() => {
                 sipd.app.showMessage('Information', 'The process has been completed! :)');
                 console.log('Done');
-            }).catch(err => {
+            })
+            .catch(err => {
+                process.exitCode = 2;
                 if (err) {
-                    console.log(err);
+                    console.error(err);
                 } else {
-                    console.log('Unknown error, aborting!!!');
+                    console.error('Unknown error, aborting!!!');
                 }
             });
         } else {
-            console.log('Unknown MODE %s!!!', this.config.mode);
+            process.exitCode = 1;
+            console.error('Unknown mode %s!!!', this.config.mode);
         }
     }
 

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/main.js

@@ -29,7 +29,7 @@ const App = require('./app');
 const Cmd = require('@ntlab/ntlib/cmd');
 
 if (!Cmd.parse() || (Cmd.get('help') && usage())) {
-    process.exit();
+    process.exit(process.exitCode !== undefined ? null : 1);
 }
 
 (function run() {
@@ -43,5 +43,6 @@ function usage() {
     console.log('Options:');
     console.log(Cmd.dump());
     console.log('');
+    process.exitCode = 0;
     return true;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ntlab/sipd-agr",
-  "version": "3.2.0",
+  "version": "3.4.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>",