Merge commit 'd1944f2afa277ae69c92697c2fcbca03a46e21a6'

Author: Cosmo Myzrail Gorynych

.github/workflows/main.yaml

@@ -25,6 +25,12 @@ jobs:
         path: './'
         spec: 'ctjsWebInstaller.spec'
 
+    - name: Sign the installer
+      run: gulp sign
+      env:
+        SIGN_PFX: ${{ secrets.SIGN_PFX }}
+        SIGN_PASSWORD: ${{ secrets.SIGN_PASSWORD }}
+
     - name: Bump version and push tag
       id: tag_version
       uses: mathieudutour/[email protected]

.gitignore

@@ -3,4 +3,5 @@ dist
 *.map
 assets/bundle.css
 assets/index.html
-node_modules
+node_modules
+*.pfx

README.md

@@ -8,12 +8,11 @@ pip install -r requirements.txt
 ## Running
 
 ```sh
-gulp
-python ./start.py
+gulp && python ./start.py
 ```
 
 ## Building (On Windows)
 
 ```sh
-./build.sh
+npm run build
 ```

build.sh

@@ -1 +1 @@
-pyinstaller start.py -w -F --add-data "./assets;/" --icon "./icon.ico" --name "ctjsWebInstaller"
+python -m PyInstaller start.py -w -F --add-data "./assets;./" --icon "./icon.ico" --name "ctjsWebInstaller" --exclude-module PyQt5  --exclude-module QtPy

ctjsWebInstaller.spec

@@ -1,45 +1,39 @@
-# -*- mode: python ; coding: utf-8 -*-
-
-
-block_cipher = None
-
-
-a = Analysis(
-    ['start.py'],
-    pathex=[],
-    binaries=[],
-    datas=[('./assets', '/')],
-    hiddenimports=[],
-    hookspath=[],
-    hooksconfig={},
-    runtime_hooks=[],
-    excludes=[],
-    win_no_prefer_redirects=False,
-    win_private_assemblies=False,
-    cipher=block_cipher,
-    noarchive=False,
-)
-pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
-
-exe = EXE(
-    pyz,
-    a.scripts,
-    a.binaries,
-    a.zipfiles,
-    a.datas,
-    [],
-    name='ctjsWebInstaller',
-    debug=False,
-    bootloader_ignore_signals=False,
-    strip=False,
-    upx=True,
-    upx_exclude=[],
-    runtime_tmpdir=None,
-    console=False,
-    disable_windowed_traceback=False,
-    argv_emulation=False,
-    target_arch=None,
-    codesign_identity=None,
-    entitlements_file=None,
-    icon='icon.ico',
-)
+# -*- mode: python ; coding: utf-8 -*-
+
+
+a = Analysis(
+    ['start.py'],
+    pathex=[],
+    binaries=[],
+    datas=[('./assets', './')],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=['PyQt5', 'QtPy'],
+    noarchive=False,
+    optimize=0,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.datas,
+    [],
+    name='ctjsWebInstaller',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon=['icon.ico'],
+)

gulpfile.js

@@ -0,0 +1,78 @@
+import fs from 'fs-extra';
+import { src, dest, parallel, series } from 'gulp';
+import stylus from 'gulp-stylus';
+import pug from 'gulp-pug';
+import log from 'gulplog';
+import resedit from 'resedit-cli';
+import {read} from 'read';
+
+const buildStylus = () =>
+    src('./src/bundle.styl')
+    .pipe(stylus({
+        compress: true,
+        'include css': true
+    }))
+    .pipe(dest('./assets/'));
+
+const buildPug = () =>
+    src('./src/index.pug')
+    .pipe(pug({
+        pretty: false
+    }))
+    .pipe(dest('./assets/'));
+
+export const build = parallel(buildStylus, buildPug);
+
+
+const dumpPfx = () => {
+    if (!process.env.SIGN_PFX) {
+        log.warn('❔ \'dumpPfx\': Cannot find PFX certificate in environment variables. Provide it as a local file at ./CoMiGoGames.pfx or set the environment variable SIGN_PFX.');
+        return Promise.resolve();
+    }
+    return fs.writeFile(
+        './CoMiGoGames.pfx',
+        Buffer.from(process.env.SIGN_PFX, 'base64')
+    );
+};
+
+const exePatch = {
+    sign: true,
+    p12: './CoMiGoGames.pfx'
+};
+if (process.env.SIGN_PASSWORD) {
+    exePatch.password = process.env.SIGN_PASSWORD.replace(/_/g, '');
+}
+
+const signInstaller = async () => {
+    if (!(await fs.pathExists(exePatch.p12))) {
+        log.warn('⚠️  \'signInstaller\': Cannot find PFX certificate. Continuing without signing.');
+        delete exePatch.p12;
+        exePatch.sign = false;
+    } else if (!process.env.SIGN_PASSWORD) {
+        log.warn('❔  \'signInstaller\': Cannot find PFX password in the SIGN_PASSWORD environment variable. Assuming manual input.');
+        const pass = await read({
+            prompt: 'Enter PFX password: (not shown. timing out in 60 seconds.)',
+            silent: true,
+            timeout: 1000 * 60
+        });
+        if (!pass) {
+            log.warn('⚠️  \'signInstaller\': Cannot find PFX password in the SIGN_PASSWORD environment variable. Continuing without signing.');
+            delete exePatch.p12;
+            exePatch.sign = false;
+        } else {
+            exePatch.password = pass;
+        }
+    }
+    if (!exePatch.sign) {
+        throw new Error('Cannot find PFX certificate or PFX password.');
+    }
+    await resedit({
+        in: `./dist/ctjsWebInstaller.exe`,
+        out: `./dist/ctjsWebInstaller.exe`,
+        ...exePatch
+    });
+};
+
+export const sign = series(dumpPfx, signInstaller);
+
+export default build;