Selfcheck for updates

package.json

@@ -5,7 +5,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "start": "tsc app.ts && node app.js",
+    "start": "npm run build:sulla & tsc app.ts && node app.js",
     "build": "npm run build:wapi && npm run build:middleware && npm run build:jsQR && tsc",
     "build:sulla": "tsc",
     "build:wapi": "cd src/lib/wapi/ && webpack",
@@ -78,10 +78,13 @@
     "webpack-cli": "^3.3.11"
   },
   "dependencies": {
+    "better-logging": "^4.0.4",
+    "boxen": "^4.2.0",
+    "chalk": "^4.0.0",
     "chrome-launcher": "^0.13.1",
     "file-type": "^14.1.4",
     "futoin-hkdf": "^1.3.2",
-    "ora": "^4.0.3",
+    "latest-version": "^5.1.0",
     "puppeteer": "^2.1.1",
     "puppeteer-extra": "^3.1.9",
     "puppeteer-extra-plugin-stealth": "^2.4.9",

src/api/layers/sender.layer.ts

@@ -289,12 +289,12 @@ export class SenderLayer extends ListenerLayer {
     );
     const mimeInfo = base64MimeType(b64);
     if (!mimeInfo || mimeInfo.includes('image')) {
-      //non matter what, convert to webp, resize + autoscale to width 512 px
+      // Convert to webp, resize + autoscale to width 512 px
       const scaledImageBuffer = await sharp(buff, { failOnError: false })
         .resize({ width: 512, height: 512 })
         .toBuffer();
       const webp = sharp(scaledImageBuffer, { failOnError: false }).webp();
-      const metadata: any = await webp.metadata();
+      const metadata = (await webp.metadata()) as any;
       const webpBase64 = (await webp.toBuffer()).toString('base64');
       return await this.page.evaluate(
         ({ webpBase64, to, metadata }) =>

src/controllers/auth.ts

@@ -44,11 +44,16 @@ export const isInsideChat = (waPage: puppeteer.Page) => {
 
 export async function retrieveQR(page: puppeteer.Page) {
   const { code, data } = await decodeQR(page);
-  qrcode.generate(code, {
-    small: true,
-  });
+  const asciiQR = await asciiQr(code);
+  return { code, data, asciiQR };
+}
 
-  return { code, data };
+async function asciiQr(code: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    qrcode.generate(code, { small: true }, (qrcode) => {
+      resolve(qrcode);
+    });
+  });
 }
 
 async function decodeQR(

src/controllers/initializer.ts

@@ -1,10 +1,14 @@
-import * as ora from 'ora';
 import { readFileSync } from 'fs';
+import latestVersion from 'latest-version';
 import { Whatsapp } from '../api/whatsapp';
 import { CreateConfig } from '../config/create-config';
 import { isAuthenticated, isInsideChat, retrieveQR } from './auth';
 import { initWhatsapp, injectApi } from './browser';
-const spinner = ora();
+import { upToDate } from '../utils/semver';
+import chalk = require('chalk');
+import boxen = require('boxen');
+
+const { version } = require('../../package.json');
 
 /**
  * Should be called to initialize whatsapp client
@@ -21,31 +25,29 @@ export async function create(
     debug: false,
   };
 
-  spinner.start('Initializing whatsapp');
+  checkSullaVersion();
   let waPage = await initWhatsapp(session, { ...defaultOptions, ...options });
-  spinner.succeed();
 
-  spinner.start('Authenticating');
+  console.log('Initializing sulla');
+  console.log('Authenticating');
   const authenticated = await isAuthenticated(waPage);
 
   // If not authenticated, show QR and wait for scan
   if (authenticated) {
-    spinner.succeed();
   } else {
-    spinner.info('Authenticate to continue');
-    const { data } = await retrieveQR(waPage);
+    console.log('Authenticate to continue');
+    const { data, asciiQR } = await retrieveQR(waPage);
     if (catchQR) {
       catchQR(data);
     }
 
     // Wait til inside chat
     await isInsideChat(waPage).toPromise();
-    spinner.succeed();
   }
 
-  spinner.start('Injecting api');
+  console.log('Injecting api');
   waPage = await injectApi(waPage);
-  spinner.succeed('Whatsapp is ready');
+  console.log('Whatsapp is ready');
 
   if (options.debug) {
     const debugURL = `http://localhost:${readFileSync(
@@ -56,3 +58,34 @@ export async function create(
 
   return new Whatsapp(waPage);
 }
+
+/**
+ * Checs for a new versoin of sulla and logs
+ */
+function checkSullaVersion() {
+  latestVersion('sulla').then((latest) => {
+    if (!upToDate(version, latest)) {
+      logUpdateAvailable(version, latest);
+    }
+  });
+}
+
+/**
+ * Logs a boxen of instructions to update
+ * @param current
+ * @param latest
+ */
+function logUpdateAvailable(current: string, latest: string) {
+  // prettier-ignore
+  const newVersionLog = 
+  `There is a new version of ${chalk.bold(`sulla`)} ${chalk.gray(current)} ➜  ${chalk.bold.green(latest)}\n` + 
+  `Update your package by running:\n\n` +
+  `${chalk.bold('\>')} ${chalk.blueBright('npm update sulla')}`;
+
+  console.log(boxen(newVersionLog, { padding: 1 }));
+  console.log(
+    `For more info visit: ${chalk.underline(
+      'https://github.com/danielcardeenas/sulla/blob/master/UPDATES.md'
+    )}\n`
+  );
+}

src/utils/semver.ts

@@ -0,0 +1,28 @@
+const VPAT = /^\d+(\.\d+){0,2}$/;
+
+/**
+ * Compares two versions
+ * @return true if local is up to date, false otherwise
+ * @param local
+ * @param remote
+ */
+export function upToDate(local: string, remote: string) {
+  if (!local || !remote || local.length === 0 || remote.length === 0)
+    return false;
+  if (local == remote) return true;
+  if (VPAT.test(local) && VPAT.test(remote)) {
+    const lparts = local.split('.');
+    while (lparts.length < 3) lparts.push('0');
+    const rparts = remote.split('.');
+    while (rparts.length < 3) rparts.push('0');
+    for (let i = 0; i < 3; i++) {
+      const l = parseInt(lparts[i], 10);
+      const r = parseInt(rparts[i], 10);
+      if (l === r) continue;
+      return l > r;
+    }
+    return true;
+  } else {
+    return local >= remote;
+  }
+}

tsconfig.json

@@ -2,6 +2,7 @@
   "compilerOptions": {
     /* Basic Options */
     "target": "es5" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */,
+    "resolveJsonModule": true,
     "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
     // "lib": [],                             /* Specify library files to be included in the compilation. */
     // "allowJs": true,                       /* Allow javascript files to be compiled. */