electron-incremental-update 0.7.2 → 0.7.3

package/dist/vite.d.mts

@@ -1,10 +1,18 @@
 import { Plugin } from 'vite';
 import { Buffer } from 'node:buffer';
-import { DistinguishedName } from '@cyyynthia/jscert';
 
-type FunctionGenerateKeyPair = (keyLength: number, subject: DistinguishedName, expires: Date) => {
-    privateKey: string;
-    cert: string;
+type DistinguishedName = {
+    countryName?: string;
+    stateOrProvinceName?: string;
+    localityName?: string;
+    organizationName?: string;
+    organizationalUnitName?: string;
+    commonName?: string;
+    serialNumber?: string;
+    title?: string;
+    description?: string;
+    businessCategory?: string;
+    emailAddress?: string;
 };
 type FunctionGenerateSignature = (buffer: Buffer, privateKey: string, cert: string, version: string) => string;
 type Options = {
@@ -98,26 +106,17 @@ type Options = {
             /**
              * the subject of the certificate
              *
-             * @default { commonName: productName, organization: `org.${productName}` }
+             * @default { commonName: productName, organizationName: `org.${productName}` }
              */
             subject?: DistinguishedName;
             /**
-             * expires of the certificate
-             * - `Date`: expire date
-             * - `number`: expire duration in seconds
+             * expire days of the certificate
              *
-             * @default Date.now() + 365 * 864e5 (1 year)
+             * @default 365
              */
-            expires?: Date | number;
+            days?: number;
         };
         overrideFunctions?: {
-            /**
-             * custom key pair generate function {@link FunctionGenerateKeyPair}
-             * @param keyLength key length
-             * @param subject subject info
-             * @param expires expire date
-             */
-            generateKeyPair?: FunctionGenerateKeyPair;
             /**
              * custom signature generate function {@link FunctionGenerateSignature}
              * @param buffer file buffer

package/dist/vite.d.ts

@@ -1,10 +1,18 @@
 import { Plugin } from 'vite';
 import { Buffer } from 'node:buffer';
-import { DistinguishedName } from '@cyyynthia/jscert';
 
-type FunctionGenerateKeyPair = (keyLength: number, subject: DistinguishedName, expires: Date) => {
-    privateKey: string;
-    cert: string;
+type DistinguishedName = {
+    countryName?: string;
+    stateOrProvinceName?: string;
+    localityName?: string;
+    organizationName?: string;
+    organizationalUnitName?: string;
+    commonName?: string;
+    serialNumber?: string;
+    title?: string;
+    description?: string;
+    businessCategory?: string;
+    emailAddress?: string;
 };
 type FunctionGenerateSignature = (buffer: Buffer, privateKey: string, cert: string, version: string) => string;
 type Options = {
@@ -98,26 +106,17 @@ type Options = {
             /**
              * the subject of the certificate
              *
-             * @default { commonName: productName, organization: `org.${productName}` }
+             * @default { commonName: productName, organizationName: `org.${productName}` }
              */
             subject?: DistinguishedName;
             /**
-             * expires of the certificate
-             * - `Date`: expire date
-             * - `number`: expire duration in seconds
+             * expire days of the certificate
              *
-             * @default Date.now() + 365 * 864e5 (1 year)
+             * @default 365
              */
-            expires?: Date | number;
+            days?: number;
         };
         overrideFunctions?: {
-            /**
-             * custom key pair generate function {@link FunctionGenerateKeyPair}
-             * @param keyLength key length
-             * @param subject subject info
-             * @param expires expire date
-             */
-            generateKeyPair?: FunctionGenerateKeyPair;
             /**
              * custom signature generate function {@link FunctionGenerateSignature}
              * @param buffer file buffer

package/dist/vite.js

@@ -142,20 +142,44 @@ var import_ci_info = require("ci-info");
 var import_node_fs2 = require("fs");
 var import_node_path2 = require("path");
 var import_node_os = require("os");
-var import_node_crypto2 = require("crypto");
-var import_jscert = require("@cyyynthia/jscert");
-function generateCert(privateKey, dn, expires) {
-  const csr = new import_jscert.CertificateSigningRequest(dn, privateKey, { digest: "sha256" });
-  return csr.createSelfSignedCertificate(expires).toPem();
+var import_node_child_process = require("child_process");
+function generateKeyPair(keyLength, subject, days, privateKeyPath, certPath) {
+  const starter = `try {
+  require('selfsigned')
+} catch (e) {
+  console.error('to generate private key, please run "npm install --dev selfsigned"')
 }
-function generateKeyPairDefault(length, subjects, expires) {
-  const { privateKey: _key } = (0, import_node_crypto2.generateKeyPairSync)("rsa", { modulusLength: length });
-  const cert = generateCert(_key, subjects, expires);
-  const privateKey = _key.export({ type: "pkcs1", format: "pem" });
-  return {
-    privateKey,
-    cert
-  };
+try {
+  const { existsSync, mkdirSync, writeFileSync } = require('node:fs')
+  const { dirname } = require('node:path')
+  const { generate } = require('selfsigned')
+  const privateKeyPath = '${privateKeyPath.replace(/\\/g, "/")}'
+  const certPath = '${certPath.replace(/\\/g, "/")}'
+  const privateKeyDir = dirname(privateKeyPath)
+  existsSync(privateKeyDir) || mkdirSync(privateKeyDir, { recursive: true })
+  const certDir = dirname(certPath)
+  existsSync(certDir) || mkdirSync(certDir, { recursive: true })
+
+  const { cert, private: privateKey } = generate(${JSON.stringify(subject)}, {
+    keySize: ${keyLength}, algorithm: 'sha256', days: ${days},
+  })
+
+  writeFileSync(privateKeyPath, privateKey.replace(/\\r/g, ''))
+  writeFileSync(certPath, cert.replace(/\\r/g, ''))
+} catch (e) {
+  console.error(e)
+  process.exit(-1)
+} finally {
+  process.exit(0)
+}
+`;
+  const fileName = "key-gen.js";
+  (0, import_node_fs2.writeFileSync)(`./${fileName}`, starter);
+  try {
+    (0, import_node_child_process.execSync)(`npx electron ${fileName}`, { stdio: "inherit" });
+  } finally {
+    (0, import_node_fs2.rmSync)(`./${fileName}`);
+  }
 }
 function writeCertToMain(entryPath, cert) {
   const file = (0, import_node_fs2.readFileSync)(entryPath, "utf-8");
@@ -188,29 +212,29 @@ function parseKeys({
   certPath,
   entryPath,
   subject,
-  expires,
-  generateKeyPair
+  days
 }) {
   const keysDir = (0, import_node_path2.dirname)(privateKeyPath);
   !(0, import_node_fs2.existsSync)(keysDir) && (0, import_node_fs2.mkdirSync)(keysDir);
-  let privateKey, cert;
   if (!(0, import_node_fs2.existsSync)(privateKeyPath) || !(0, import_node_fs2.existsSync)(certPath)) {
-    const _func = generateKeyPair ?? generateKeyPairDefault;
-    const keys = _func(keyLength, subject, expires);
-    privateKey = keys.privateKey;
-    cert = keys.cert;
-    (0, import_node_fs2.writeFileSync)(privateKeyPath, privateKey);
-    (0, import_node_fs2.writeFileSync)(certPath, cert);
-  } else {
-    privateKey = (0, import_node_fs2.readFileSync)(privateKeyPath, "utf-8");
-    cert = (0, import_node_fs2.readFileSync)(certPath, "utf-8");
+    generateKeyPair(keyLength, parseSubjects(subject), days, privateKeyPath, certPath);
   }
+  const privateKey = (0, import_node_fs2.readFileSync)(privateKeyPath, "utf-8");
+  const cert = (0, import_node_fs2.readFileSync)(certPath, "utf-8");
   writeCertToMain(entryPath, cert);
   return {
     privateKey,
     cert
   };
 }
+function parseSubjects(subject) {
+  const ret = [];
+  Object.keys(subject).forEach((name) => {
+    const value = subject[name];
+    value && ret.push({ name, value });
+  });
+  return ret;
+}
 
 // src/build-plugins/option.ts
 function parseOptions(options) {
@@ -236,16 +260,13 @@ function parseOptions(options) {
       overrideFunctions = {}
     } = {}
   } = options;
-  const {
-    generateKeyPair,
-    generateSignature
-  } = overrideFunctions;
+  const { generateSignature } = overrideFunctions;
   let {
     subject = {
       commonName: productName,
-      organization: `org.${productName}`
+      organizationName: `org.${productName}`
     },
-    expires = Date.now() + 365 * 864e5
+    days = 365
   } = certInfo;
   const buildAsarOption = {
     version,
@@ -261,17 +282,13 @@ function parseOptions(options) {
   };
   let buildVersionOption;
   if (!import_ci_info.isCI) {
-    if (typeof expires === "number") {
-      expires = new Date(Date.now() + expires);
-    }
     const { privateKey, cert } = parseKeys({
       keyLength,
       privateKeyPath,
       certPath,
       entryPath,
       subject,
-      expires,
-      generateKeyPair
+      days
     });
     buildVersionOption = {
       version,

package/dist/vite.mjs

@@ -75,23 +75,47 @@ async function buildEntry({
 import { isCI } from "ci-info";
 
 // src/build-plugins/key.ts
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { EOL } from "node:os";
-import { generateKeyPairSync } from "node:crypto";
-import { CertificateSigningRequest } from "@cyyynthia/jscert";
-function generateCert(privateKey, dn, expires) {
-  const csr = new CertificateSigningRequest(dn, privateKey, { digest: "sha256" });
-  return csr.createSelfSignedCertificate(expires).toPem();
+import { execSync } from "node:child_process";
+function generateKeyPair(keyLength, subject, days, privateKeyPath, certPath) {
+  const starter = `try {
+  require('selfsigned')
+} catch (e) {
+  console.error('to generate private key, please run "npm install --dev selfsigned"')
 }
-function generateKeyPairDefault(length, subjects, expires) {
-  const { privateKey: _key } = generateKeyPairSync("rsa", { modulusLength: length });
-  const cert = generateCert(_key, subjects, expires);
-  const privateKey = _key.export({ type: "pkcs1", format: "pem" });
-  return {
-    privateKey,
-    cert
-  };
+try {
+  const { existsSync, mkdirSync, writeFileSync } = require('node:fs')
+  const { dirname } = require('node:path')
+  const { generate } = require('selfsigned')
+  const privateKeyPath = '${privateKeyPath.replace(/\\/g, "/")}'
+  const certPath = '${certPath.replace(/\\/g, "/")}'
+  const privateKeyDir = dirname(privateKeyPath)
+  existsSync(privateKeyDir) || mkdirSync(privateKeyDir, { recursive: true })
+  const certDir = dirname(certPath)
+  existsSync(certDir) || mkdirSync(certDir, { recursive: true })
+
+  const { cert, private: privateKey } = generate(${JSON.stringify(subject)}, {
+    keySize: ${keyLength}, algorithm: 'sha256', days: ${days},
+  })
+
+  writeFileSync(privateKeyPath, privateKey.replace(/\\r/g, ''))
+  writeFileSync(certPath, cert.replace(/\\r/g, ''))
+} catch (e) {
+  console.error(e)
+  process.exit(-1)
+} finally {
+  process.exit(0)
+}
+`;
+  const fileName = "key-gen.js";
+  writeFileSync(`./${fileName}`, starter);
+  try {
+    execSync(`npx electron ${fileName}`, { stdio: "inherit" });
+  } finally {
+    rmSync(`./${fileName}`);
+  }
 }
 function writeCertToMain(entryPath, cert) {
   const file = readFileSync(entryPath, "utf-8");
@@ -124,29 +148,29 @@ function parseKeys({
   certPath,
   entryPath,
   subject,
-  expires,
-  generateKeyPair
+  days
 }) {
   const keysDir = dirname(privateKeyPath);
   !existsSync(keysDir) && mkdirSync(keysDir);
-  let privateKey, cert;
   if (!existsSync(privateKeyPath) || !existsSync(certPath)) {
-    const _func = generateKeyPair ?? generateKeyPairDefault;
-    const keys = _func(keyLength, subject, expires);
-    privateKey = keys.privateKey;
-    cert = keys.cert;
-    writeFileSync(privateKeyPath, privateKey);
-    writeFileSync(certPath, cert);
-  } else {
-    privateKey = readFileSync(privateKeyPath, "utf-8");
-    cert = readFileSync(certPath, "utf-8");
+    generateKeyPair(keyLength, parseSubjects(subject), days, privateKeyPath, certPath);
   }
+  const privateKey = readFileSync(privateKeyPath, "utf-8");
+  const cert = readFileSync(certPath, "utf-8");
   writeCertToMain(entryPath, cert);
   return {
     privateKey,
     cert
   };
 }
+function parseSubjects(subject) {
+  const ret = [];
+  Object.keys(subject).forEach((name) => {
+    const value = subject[name];
+    value && ret.push({ name, value });
+  });
+  return ret;
+}
 
 // src/build-plugins/option.ts
 function parseOptions(options) {
@@ -172,16 +196,13 @@ function parseOptions(options) {
       overrideFunctions = {}
     } = {}
   } = options;
-  const {
-    generateKeyPair,
-    generateSignature
-  } = overrideFunctions;
+  const { generateSignature } = overrideFunctions;
   let {
     subject = {
       commonName: productName,
-      organization: `org.${productName}`
+      organizationName: `org.${productName}`
     },
-    expires = Date.now() + 365 * 864e5
+    days = 365
   } = certInfo;
   const buildAsarOption = {
     version,
@@ -197,17 +218,13 @@ function parseOptions(options) {
   };
   let buildVersionOption;
   if (!isCI) {
-    if (typeof expires === "number") {
-      expires = new Date(Date.now() + expires);
-    }
     const { privateKey, cert } = parseKeys({
       keyLength,
       privateKeyPath,
       certPath,
       entryPath,
       subject,
-      expires,
-      generateKeyPair
+      days
     });
     buildVersionOption = {
       version,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "electron-incremental-update",
   "author": "subframe7536",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "electron incremental update tools, powered by vite",
   "scripts": {
     "build": "tsup && node fix-module.js",
@@ -56,7 +56,9 @@
     "vitest": "^0.32.2"
   },
   "dependencies": {
-    "@cyyynthia/jscert": "^0.1.2",
     "ci-info": "^3.8.0"
+  },
+  "peerDependencies": {
+    "selfsigned": "^2.1.1"
   }
 }