.github/workflows/build.yml

@@ -0,0 +1,94 @@
+name: Build/release
+
+on: push
+
+jobs:
+  release:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v1
+
+      - name: Install Node.js, NPM and Yarn
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+
+      - name: Build/release app
+        uses: samuelmeuli/action-electron-builder@v1
+        with:
+          github_token: ${{ secrets.github_token }}
+          release: ${{ startsWith(github.ref, 'refs/tags/v') }}
+
+      - name: List Files
+        shell: bash
+        run: ls -lah dist
+
+      - name: Upload Postbird.dmg
+        uses: actions/upload-artifact@v2
+        with:
+          name: Postbird.dmg
+          path: dist/*.dmg
+        if: ${{ runner.os == 'macOS' }}
+
+      - name: Upload Postbird_setup.exe
+        uses: actions/upload-artifact@v2
+        with:
+          name: Postbird_setup.exe
+          path: dist/*.exe
+        if: ${{ runner.os == 'Windows' }}
+
+      - name: Upload Postbird-win.zip
+        uses: actions/upload-artifact@v2
+        with:
+          name: Postbird_win.zip
+          path: dist/*.zip
+        if: ${{ runner.os == 'Windows' }}
+
+      - name: Upload Postbird.snap
+        uses: actions/upload-artifact@v2
+        with:
+          name: Postbird.snap
+          path: dist/*.snap
+        if: ${{ runner.os == 'Linux' }}
+
+      - name: Upload Postbird.AppImage
+        uses: actions/upload-artifact@v2
+        with:
+          name: Postbird.AppImage
+          path: dist/Postbird*.AppImage
+        if: ${{ runner.os == 'Linux' }}
+
+      - name: Upload Postbird.deb
+        uses: actions/upload-artifact@v2
+        with:
+          name: Postbird.deb
+          path: dist/*.deb
+        if: ${{ runner.os == 'Linux' }}
+
+      - name: Upload Postbird.rpm
+        uses: actions/upload-artifact@v2
+        with:
+          name: Postbird.rpm
+          path: dist/*.rpm
+        if: ${{ runner.os == 'Linux' }}
+
+      - name: Upload Postbird.pacman
+        uses: actions/upload-artifact@v2
+        with:
+          name: Postbird.pacman
+          path: dist/*.pacman
+        if: ${{ runner.os == 'Linux' }}
+
+      - name: Upload Postbird.apk
+        uses: actions/upload-artifact@v2
+        with:
+          name: Postbird.apk
+          path: dist/*.apk
+        if: ${{ runner.os == 'Linux' }}
+

.gitignore

@@ -3,3 +3,4 @@ libudev.so.0
 node_modules/
 .ruby-version
 dist/
+.DS_Store

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '11'
+  - '12'
 
 os:
   - osx

BUILDING_DEPS.md

@@ -4,32 +4,38 @@ Download `Postgres.app` and make sure you have command line tools installed
 ```
 # Copy postgres libs
 
-cp /Applications/Postgres.app/Contents/Versions/latest/lib/libpq.5.12.dylib ./vendor/darwin/
+cp /Applications/Postgres.app/Contents/Versions/latest/lib/libpq.5.14.dylib ./vendor/darwin/
 cp /Applications/Postgres.app/Contents/Versions/latest/lib/libssl.1.1.dylib ./vendor/darwin/
 cp /Applications/Postgres.app/Contents/Versions/latest/lib/libcrypto.1.1.dylib ./vendor/darwin/
 
-install_name_tool -change /Applications/Postgres.app/Contents/Versions/12/lib/libssl.1.1.dylib @loader_path/libssl.1.1.dylib ./vendor/darwin/libpq.5.12.dylib
-install_name_tool -change /Applications/Postgres.app/Contents/Versions/12/lib/libcrypto.1.1.dylib @loader_path/libcrypto.1.1.dylib ./vendor/darwin/libpq.5.12.dylib
-install_name_tool -change /Applications/Postgres.app/Contents/Versions/12/lib/libcrypto.1.1.dylib @loader_path/libcrypto.1.1.dylib ./vendor/darwin/libssl.1.1.dylib
+install_name_tool -change /Applications/Postgres.app/Contents/Versions/14/lib/libssl.1.1.dylib @loader_path/libssl.1.1.dylib ./vendor/darwin/libpq.5.14.dylib
+install_name_tool -change /Applications/Postgres.app/Contents/Versions/14/lib/libcrypto.1.1.dylib @loader_path/libcrypto.1.1.dylib ./vendor/darwin/libpq.5.14.dylib
+install_name_tool -change /Applications/Postgres.app/Contents/Versions/14/lib/libcrypto.1.1.dylib @loader_path/libcrypto.1.1.dylib ./vendor/darwin/libssl.1.1.dylib
 
 ## check with otool
 
-otool -L vendor/darwin/libpq.5.12.dylib
+otool -L vendor/darwin/libpq.5.14.dylib
 otool -L vendor/darwin/libssl.1.1.dylib
 otool -L vendor/darwin/libcrypto.1.1.dylib
 
 # Copy postgres psql & pg_dump
 cp /Applications/Postgres.app/Contents/Versions/latest/bin/psql    ./vendor/darwin/
 cp /Applications/Postgres.app/Contents/Versions/latest/bin/pg_dump ./vendor/darwin/
 
-install_name_tool -change /Applications/Postgres.app/Contents/Versions/12/lib/libpq.5.dylib @loader_path/libpq.5.12.dylib ./vendor/darwin/psql
-install_name_tool -change /Applications/Postgres.app/Contents/Versions/12/lib/libpq.5.dylib @loader_path/libpq.5.12.dylib ./vendor/darwin/pg_dump
+install_name_tool -change /Applications/Postgres.app/Contents/Versions/14/lib/libpq.5.dylib @loader_path/libpq.5.14.dylib ./vendor/darwin/psql
+install_name_tool -change /Applications/Postgres.app/Contents/Versions/14/lib/libpq.5.dylib @loader_path/libpq.5.14.dylib ./vendor/darwin/pg_dump
 
 ## check with otool
 
 otool -L vendor/darwin/psql
 otool -L vendor/darwin/pg_dump
 
+# make it run on catalina
+
+xattr -d com.apple.quarantine vendor/darwin/*
+spctl --assess vendor/darwin/*
+codesign --remove-signature vendor/darwin/*
+
 # Build libpq package
 
 PATH=/Applications/Postgres.app/Contents/Versions/latest/bin:$PATH ./node_modules/.bin/electron-rebuild -n 59

CHANGELOG.md

@@ -1,3 +1,11 @@
+### Version 0.9.0
+
+* Fix ssl connection & heroku connection (Thanks to [https://github.com/egallup02360](@egallup02360) #95)
+* Postgres 12 support
+* Update to electron 10.1.2
+* Fix "Snippets" and "See History" on windows (Thanks to [https://github.com/mastazi](@mastazi) #118)
+* Allow to cancel loader window when connecting to server
+
 ### Version 0.8.4 (20-nov-2019)
 
 * Fix `electron.systemPreferences.subscribeNotification` is not a function

README.md

@@ -28,10 +28,10 @@ sudo snap install postbird
 ```
 Snap page: https://snapcraft.io/postbird
 
-Windows installer: [Postbird.Setup.0.8.4.exe](https://github.com/Paxa/postbird/releases/download/0.8.4/Postbird.Setup.0.8.4.exe)<br>
+Windows installer: [Postbird.Setup.0.8.4.exe](https://github.com/Paxa/postbird/releases/download/0.8.4/Postbird-Setup-0.8.4.exe)<br>
 Windows portable: [Postbird-0.8.4-win.zip](https://github.com/Paxa/postbird/releases/download/0.8.4/Postbird-0.8.4-win.zip)
 
-Latest artifacts: https://postbird.paxa.kuber.host/
+Latest artifacts: https://nightly.link/Paxa/postbird/workflows/build/master
 
 ## Development
 
@@ -47,7 +47,6 @@ To run newest version, simply:
 git clone git@github.com:Paxa/postbird.git
 cd postbird
 yarn
-yarn rebuild_ext
 yarn start
 ```
 

app.js

@@ -1,4 +1,4 @@
-var remote = require('electron').remote;
+var remote = require('@electron/remote');
 var events = require('events');
 var path = require('path');
 
@@ -44,7 +44,7 @@ interface App {
   addConnectionTab: () => any;
   addDbScreen: (connection: Connection, connectionName: any, options: any) => void;
   addHelpScreen: () => void;
-  helpScreenOpen: () => void;
+  helpScreenOpen: () => boolean;
   renderView: (viewName: string, options?: any) => JQuery<HTMLElement>;
   setSizes: () => void;
   startLoading: (message: string, timeout?: number, options?: any) => void;
@@ -76,11 +76,11 @@ interface App {
 */
 
 global.App = {
-  root: process.mainModule.filename.replace(/\/index.html/, ''),
+  root: remote.app.getAppPath(),
   // used for running binaries inside asar package
-  vendorPath: process.mainModule.filename.includes('app.asar') ?
-    path.join(process.mainModule.filename, `../../../vendor/${process.platform}`) :
-    path.join(process.mainModule.filename.replace('node_modules/electron-mocha/lib/main.js', 'index.html'), `../vendor/${process.platform}`),
+  vendorPath: remote.app.MainFilename.includes('app.asar') ?
+    path.join(remote.app.MainFilename, `../../../vendor/${process.platform}`) :
+    path.join(remote.app.MainFilename.replace('node_modules/electron-mocha/lib/main.js', 'index.html'), `../vendor/${process.platform}`),
 
   activeTab: null,
   tabs: [], // {name, content, is_active}
@@ -306,28 +306,51 @@ global.App = {
   },
 
   openConnection: function (options, connectionName, callback) {
-    this.startLoading("Connecting...");
+    var showConnectionError = true;
+    var runCallback = true;
+
+    this.startLoading("Connecting...", 500, {
+      cancel() {
+        App.stopRunningQuery();
+        App.stopLoading();
+        showConnectionError = false
+        if (callback) callback(false);
+        runCallback = false
+      }
+    });
+    //this.startLoading("Connecting...");
 
     if (typeof options == 'string') {
       options = Connection.parseConnectionString(options);
       if (!connectionName) {
-        connectionName = options.host;
+        if (options.tab_name && options.tab_name != "") {
+          connectionName = options.tab_name;
+        } else {
+          connectionName = options.host;
+        }
       }
     }
 
     var conn = new Connection();
     conn.connectToServer(options, (status, error) => {
       this.stopLoading();
       if (status) {
+        if (conn.options.tab_name) {
+          connectionName = conn.options.tab_name;
+        }
         var tab = this.addDbScreen(conn, connectionName, options);
         tab.activate();
-        if (callback) callback(tab);
+        if (callback && runCallback) callback(tab);
       } else {
-        $u.alertError("Connection error", {
-          detail: this.humanErrorMessage(error)
-        });
+        if (showConnectionError) {
+          $u.alertError("Connection error", {
+            detail: this.humanErrorMessage(error)
+          });
+        } else {
+          console.error(error)
+        }
         //window.alertify.alert(this.humanErrorMessage(message));
-        if (callback) callback(false);
+        if (callback && runCallback) callback(false);
       }
     });
   },

app/components/render_view.js

@@ -4,6 +4,7 @@ var slash = require('slash');
 var fs = require('fs');
 
 require(__dirname + '/../view_helpers');
+require(__dirname + '/../view_cell_helpers');
 
 var dirname = process.platform === "win32"? slash(__dirname): __dirname;
 
@@ -13,23 +14,12 @@ var RenderView = {
   pugFn: {},
 
   renderView: function (file, options) {
-    var html;
-    var new_options = {};
-    var i;
-
-    for (i in ViewHelpers) {
-      if (typeof ViewHelpers[i] == 'function') {
-        new_options[i] = ViewHelpers[i].bind(ViewHelpers);
-      }
-    }
-
-    if (options) {
-      for (i in options) new_options[i] = options[i];
-    }
+    var newOptions = options ? {...this.getViewHelpers(), ...options} : this.getViewHelpers();
 
+    var html;
     try {
       //var st = Date.now();
-      html = this.compileJade(file)(pugRuntime, new_options);
+      html = this.compileJade(file)(pugRuntime, newOptions);
       //console.log('pug render ' + file + ' in ' + (Date.now() - st) + 'ms');
     } catch (error) {
       console.log("Error compiling '" + RenderView.root + '/views/' + file + '.jade');
@@ -44,6 +34,24 @@ var RenderView = {
     return res;
   },
 
+  getViewHelpers() {
+    if (!this._viewHelpers) {
+      this._viewHelpers = {};
+      var i;
+      for (i in ViewHelpers) {
+        if (typeof ViewHelpers[i] == 'function') {
+          this._viewHelpers[i] = ViewHelpers[i].bind(ViewHelpers);
+        }
+      }
+      for (i in ViewCellHelpers) {
+        if (typeof ViewCellHelpers[i] == 'function') {
+          this._viewHelpers[i] = ViewCellHelpers[i].bind(ViewCellHelpers);
+        }
+      }
+    }
+    return this._viewHelpers;
+  },
+
   compileJade: function (file) {
     var filepath = RenderView.root + '/views/' + file + '.jade';
     var content = fs.readFileSync(filepath, 'utf-8');