fixed more issues with uploaded and fixed windows electron build

Author: ben-of-codecraft

.gitignore

@@ -1,15 +1,17 @@
-# OS X
-.DS_Store
+# OS X
+.DS_Store
+
+# npm
+node_modules
+package-lock.json
+
+# WebStorm
+.idea
+
+# build
+dist/
+
+# config
+.env
 
-# npm
-node_modules
-package-lock.json
-
-# WebStorm
-.idea
-
-# build
-dist/
-
-# config
-.env
+out/

__tests__/main-process/utils.js

@@ -1,43 +1,44 @@
-require('dotenv').config();
-const pLimit = require('p-limit');
-const {ipcMain} = require('electron');
-const {
-	MAIN_API,
-} = require('../../src/shared/constants/ipc');
-const {
-	api,
-} = require('../../src/main-process/preload/utils');
-
-const AWS_CONFIG = {
-	accessKeyId: process.env.S3_ACCESS_KEY_ID,
-	secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
-	region: 'us-west-2',
-	bucket: 'integration-testing-or',
-};
-
-exports.AWS_CONFIG = AWS_CONFIG;
-
-exports.mockIpcMainApi = () => {
-	const {
-		generateIpcMainApiHandler,
-	} = require('../../src/main-process/ipc-handlers/main-api');
-
-	ipcMain.handle(MAIN_API, generateIpcMainApiHandler());
-};
-
-exports.setS3Settings = async () => api.updateS3Settings({
-	accessKeyId: AWS_CONFIG.accessKeyId,
-	secretAccessKey: AWS_CONFIG.secretAccessKey,
-	region: AWS_CONFIG.region,
-	bucket: AWS_CONFIG.bucket,
-});
-
-exports.cleanDatabase = async () => {
-	const models = require('../../src/main-process/models/data');
-	const limit = pLimit(1);
-
-	return Promise.all(
-		Object.values(models.sequelize.models)
-			.map(model => limit(() => model.destroy({where: {}}))),
-	);
-};
+require('dotenv').config();
+const pLimit = require('p-limit');
+const {ipcMain} = require('electron');
+const {
+	MAIN_API,
+} = require('../../src/shared/constants/ipc');
+const {
+	api,
+} = require('../../src/main-process/preload/utils');
+
+const AWS_CONFIG = {
+	accessKeyId: process.env.S3_ACCESS_KEY_ID,
+	secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
+	region: 'us-west-2',
+	bucket: 'integration-testing-or',
+};
+
+exports.AWS_CONFIG = AWS_CONFIG;
+
+exports.mockIpcMainApi = () => {
+	const {
+		generateIpcMainApiHandler,
+	} = require('../../src/main-process/ipc-handlers/main-api');
+
+	ipcMain.handle(MAIN_API, generateIpcMainApiHandler());
+};
+
+exports.setS3Settings = async () => api.updateS3Settings({
+	accessKeyId: AWS_CONFIG.accessKeyId,
+	secretAccessKey: AWS_CONFIG.secretAccessKey,
+	region: AWS_CONFIG.region,
+	bucket: AWS_CONFIG.bucket,
+	endpoint: AWS_CONFIG.endpoint,
+});
+
+exports.cleanDatabase = async () => {
+	const models = require('../../src/main-process/models/data');
+	const limit = pLimit(1);
+
+	return Promise.all(
+		Object.values(models.sequelize.models)
+			.map(model => limit(() => model.destroy({where: {}}))),
+	);
+};

forge.config.js

@@ -0,0 +1,30 @@
+module.exports = {
+  packagerConfig: {
+    asar: true,
+  },
+  rebuildConfig: {},
+  makers: [
+    {
+      name: '@electron-forge/maker-squirrel',
+      config: {},
+    },
+    {
+      name: '@electron-forge/maker-zip',
+      platforms: ['darwin'],
+    },
+    {
+      name: '@electron-forge/maker-deb',
+      config: {},
+    },
+    {
+      name: '@electron-forge/maker-rpm',
+      config: {},
+    },
+  ],
+  plugins: [
+    {
+      name: '@electron-forge/plugin-auto-unpack-natives',
+      config: {},
+    },
+  ],
+};

package.json

@@ -1,32 +1,37 @@
 {
   "name": "electron-s3-file-manager",
-  "productName": "Electron S3 File Manager",
+  "productName": "Araxia Client Patch Manager",
   "bundleID": "io.github.kelp404.electron-s3-file-manager",
-  "version": "0.3.0",
+  "version": "1.0.0",
   "description": "A GUI AWS S3 file manager. It supports keyword search, download, upload and preview video.",
   "main": "dist/main-process/index.js",
   "scripts": {
-    "build": "npm run clear:build && npm run build:renderer && npm run build:main && node tools.js build",
-    "build:main": "cp -r src/main-process src/shared dist/.",
-    "build:renderer": "NODE_ENV=production webpack",
+    "build": "npm run clear:build && npm run build:renderer && npm run build:main",
+    "build:mkdir": "mkdirp ./dist/main-process && mkdirp ./dist/shared",
+    "build:main": "npm run build:mkdir && ncp ./src/main-process ./dist/main-process && ncp ./src/shared ./dist/shared",
+    "make": "npx electron-forge make",
+    "build:renderer": "npx webpack",
     "changelog": "node_modules/conventional-changelog-cli/cli.js -n node_modules/@kelp404/changelog.config",
-    "clear:build": "rm -rf dist",
+    "clear:build": "rimraf dist/",
     "dev": "concurrently --kill-others \"webpack serve\" \"wait-on tcp:3000 && electron src/main-process/index.js\"",
     "eslint": "eslint ./ --ignore-path .gitignore --ignore-pattern src/main-process/migrations/",
     "ncu": "npm-check-updates",
-    "start": "npm run dev",
+    "start": "electron-forge start",
     "test": "npm run test:main && npm run test:render",
     "test:main": "jest --config __tests__/main-process/jest.config.js",
     "test:render": "jest --config __tests__/render-process/jest.config.js",
     "makemigration": "makemigration --name $npm_package_version --migrations-path src/main-process/migrations --models-path src/main-process/models/data && eslint src/main-process/migrations --fix || true",
-    "runmigration": "runmigration --migrations-path src/main-process/migrations --models-path src/main-process/models/data"
+    "runmigration": "runmigration --migrations-path src/main-process/migrations --models-path src/main-process/models/data",
+    "package": "electron-forge package"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/kelp404/electron-s3-file-manager.git"
   },
   "author": "Kelp <[email protected]>",
-  "contributors": ["Ben Carter @ben-of-codecraft"],
+  "contributors": [
+    "Ben Carter @ben-of-codecraft"
+  ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/kelp404/electron-s3-file-manager/issues"
@@ -40,9 +45,11 @@
     "@aws-sdk/s3-request-presigner": "3.215.0",
     "@kelp404/sequelize-auto-migrations": "1.3.1",
     "electron-is-dev": "2.0.0",
+    "electron-squirrel-startup": "^1.0.0",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
     "p-limit": "3.1.0",
+    "rimraf": "^5.0.1",
     "sequelize": "6.31.0",
     "sqlite3": "5.1.4"
   },
@@ -52,6 +59,12 @@
     "@babel/eslint-parser": "7.22.11",
     "@babel/preset-env": "7.21.4",
     "@babel/preset-react": "7.18.6",
+    "@electron-forge/cli": "^6.4.2",
+    "@electron-forge/maker-deb": "^6.4.2",
+    "@electron-forge/maker-rpm": "^6.4.2",
+    "@electron-forge/maker-squirrel": "^6.4.2",
+    "@electron-forge/maker-zip": "^6.4.2",
+    "@electron-forge/plugin-auto-unpack-natives": "^6.4.2",
     "@fortawesome/fontawesome-free": "6.1.2",
     "@kelp404/changelog.config": "0.1.0",
     "@kelp404/react-infinite-scroller": "1.2.6",
@@ -68,7 +81,6 @@
     "dayjs": "1.11.5",
     "dotenv": "16.0.3",
     "electron": "20.3.8",
-    "electron-builder": "23.6.0",
     "electron-mock-ipc": "0.3.12",
     "electron-reload": "2.0.0-alpha.1",
     "eslint": "8.39.0",
@@ -85,6 +97,8 @@
     "jest-environment-jsdom": "29.5.0",
     "jest-environment-node": "29.4.1",
     "mini-css-extract-plugin": "2.6.1",
+    "mkdirp": "^3.0.1",
+    "ncp": "^2.0.0",
     "npm-check-updates": "16.10.9",
     "prop-types": "15.8.1",
     "pubsub-js": "1.9.4",
@@ -98,7 +112,7 @@
     "sweetalert2": "11.6.15",
     "wait-on": "6.0.1",
     "webpack": "5.81.0",
-    "webpack-cli": "4.10.0",
+    "webpack-cli": "^4.10.0",
     "webpack-dev-server": "4.9.2"
   }
 }

src/main-process/common/database.js

@@ -19,7 +19,7 @@ exports.connectDatabase = ({isLogSQL = false} = {}) => {
 	exports._sequelize = exports._sequelize || new Sequelize({
 		dialect: 'sqlite',
 		storage: exports.DATABASE_PATH,
-		logging: isLogSQL ? console.log : false,
+		logging: false //isLogSQL && ? console.log : false,
 	});
 
 	return {

src/main-process/common/s3.js

@@ -182,6 +182,7 @@ exports.putObject = (path, options = {}) => {
 			secretAccessKey: settings.secretAccessKey,
 		},
 	});
+
 	const putObjectCommand = new PutObjectCommand({
 		...options,
 		Bucket: settings.bucket,
@@ -208,6 +209,7 @@ exports.upload = ({path, content, options, onProgress}) => {
 			secretAccessKey: settings.secretAccessKey,
 		},
 	});
+
 	const upload = new Upload({
 		client,
 		params: {

src/main-process/ipc-handlers/main-api/object-handler.js

@@ -206,7 +206,8 @@ exports.createFile = async ({$event, localPath, dirname, onProgressChannel} = {}
 		throw error;
 	}
 
-	try {		
+	try {
+		console.log(mimeTypes.lookup(basename));
 		await s3.upload({
 			path: object.path,
 			content: fs.createReadStream(localPath),
@@ -221,6 +222,7 @@ exports.createFile = async ({$event, localPath, dirname, onProgressChannel} = {}
 		object.lastModified = objectHeaders.LastModified;
 		await object.save();
 	} catch (error) {
+		console.log(error.message);
 		await object.destroy();
 		throw error;
 	}

tools.js

@@ -56,7 +56,7 @@ function build() {
 			x64: true,
 			projectDir: path.resolve(__dirname),
 			win: ['portable'],
-			mac: ['dmg'],
+			// mac: ['dmg'],
 			config: {
 				copyright: 'Copyright © 2022 kelp404',
 				directories: {

webpack.config.js

@@ -8,7 +8,7 @@ module.exports = () => {
 
 	return {
 		target: 'web',
-		mode: IS_DEVELOPMENT ? 'development' : 'production',
+		mode: 'development', //'production',
 		entry: {
 			renderer: path.join(__dirname, 'src', 'renderer-process', 'index.js'),
 			'dark-theme': path.join(__dirname, 'src', 'renderer-process', 'stylesheets', 'dark-theme.scss'),