@zwa73/dev-utils 1.0.64 → 1.0.66

package/data/CreateElectronFrame/src/Backend/BridgeBackend.ts

@@ -0,0 +1,19 @@
+import { IpcMainInvokeEvent, app } from "electron";
+
+/**后端桥对象 */
+export const BridgeBackend = {
+    getAppPath() {
+        return app.getAppPath();
+    },
+    test(e: IpcMainInvokeEvent, text: string) {
+        return text + 0;
+    },
+};
+export type BridgeBackend = typeof BridgeBackend;
+
+//断言确保桥符合类型
+const assertBridge = <
+    T extends {
+        [key in string|number|symbol]: (arg1: IpcMainInvokeEvent, ...args: any[]) => any;
+    } & { getBridgeKeys?: never } >(t:T) => undefined;
+assertBridge(BridgeBackend);

package/data/CreateElectronFrame/src/Backend/index.ts

@@ -0,0 +1 @@
+export * from './BridgeBackend';

package/data/CreateElectronFrame/src/Frontend/ContextProxy.ts

@@ -0,0 +1,14 @@
+import { webUtils } from "electron";
+import type { BridgeDefine } from "@";
+
+
+
+/**前端桥对象 */
+export type BridgeProxy = BridgeDefine;
+export const BridgeProxy:BridgeProxy = new Proxy({},{
+    get: (target, prop) => async (...args:any) =>
+        (await (window as any).bridge)[prop](...args)
+}) as any;
+
+/**代理webUtils */
+export const WebUtilsProxy:typeof webUtils = (window as any).webUtils;

package/data/CreateElectronFrame/src/Frontend/index.ts

@@ -0,0 +1,2 @@
+export * from './Base';
+export * from './ContextProxy';

package/data/CreateElectronFrame/src/app.tsx

@@ -1,6 +1,5 @@
 import { createRoot } from 'react-dom/client';
-import { Base } from 'Component';
-
+import { Base } from 'Frontend';
 
 
 const root = createRoot(document.body);

package/data/CreateElectronFrame/src/index.ts

@@ -1,5 +1,5 @@
 import { app, BrowserWindow, ipcMain, IpcMainInvokeEvent, nativeTheme } from "electron";
-import { FuncObj } from "./Static";
+import { BridgeBackend } from "./Backend";
 // This allows TypeScript to pick up the magic constants that's auto-generated by Forge's Webpack
 // plugin that tells the Electron app where to look for the Webpack-bundled app code (depending on
 // whether you're running in development or production).
@@ -52,20 +52,6 @@ const createWindow = (): void => {
 // Some APIs can only be used after this event occurs.
 app.on("ready", createWindow);
 
-//#region function define
-Object.entries(FuncObj).forEach(([k, v]) => ipcMain.handle(k, v));
-
-type RemoveFirstArg<T> = T extends (arg1: IpcMainInvokeEvent, ...args: infer Rest) => infer R
-    ? (...args: Rest) => R
-    : T;
-
-export type Bridge = {
-    [P in keyof FuncObj]: FuncObj[P] extends (...args: infer Arg) => infer Out
-        ? RemoveFirstArg<(...args: Arg) => Promise<Out>>
-        : never;
-};
-//#endregion
-
 // Quit when all windows are closed, except on macOS. There, it's common
 // for applications and their menu bar to stay active until the user quits
 // explicitly with Cmd + Q.
@@ -84,3 +70,21 @@ app.on("activate", () => {
 
 // In this file you can include the rest of your app's specific main process
 // code. You can also put them in separate files and import them here.
+
+
+//#region function define
+//链接IPC与后端桥对象
+Object.entries(BridgeBackend).forEach(([k, v]) => ipcMain.handle(k, v));
+ipcMain.handle('getBridgeKeys', () => Object.keys(BridgeBackend));
+
+type RemoveIpcEventArg<T> =
+    T extends (arg1: IpcMainInvokeEvent, ...args: infer Rest) => infer R
+        ? (...args: Rest) => R : T;
+
+/**前端桥对象定义 */
+export type BridgeDefine = {
+    [P in keyof BridgeBackend]: BridgeBackend[P] extends (...args: infer Arg) => infer Out
+        ? RemoveIpcEventArg<(...args: Arg) => Promise<Out>>
+        : never;
+};
+//#endregion

package/data/CreateElectronFrame/src/preload.ts

@@ -1,2 +1,14 @@
-// See the Electron documentation for details on how to use preload scripts:
-// https://www.electronjs.org/docs/latest/tutorial/process-model#preload-scripts
+import { contextBridge, ipcRenderer, webUtils } from 'electron';
+import type { BridgeDefine } from './index';
+
+/**预加载后端桥对象 */
+const BridgePreload = new Promise(async (resolve) =>
+    resolve(((await ipcRenderer.invoke("getBridgeKeys")) as string[])
+        .map((k) => [k, async (...args: any) => await ipcRenderer.invoke(k, ...args)] as const)
+        .reduce((acc, [k, v]) => ({ ...acc, [k]: v }), {} as any as BridgeDefine)));
+
+//暴露后端桥对象
+contextBridge.exposeInMainWorld('bridge', BridgePreload);
+
+//暴露webUtils
+contextBridge.exposeInMainWorld('webUtils', webUtils);

package/data/CreateElectronFrame/tsconfig.json

@@ -18,8 +18,8 @@
             "@/src/*": ["./src/*"],
             "@/*": ["./*"],
             "@": ["./src/index"],
-            "Static": ["./src/Static"],
-            "Component": ["./src/Component"]
+            "Frontend": ["./src/Frontend"],
+            "Backend" : ["./src/Backend"]
         }
     },
     "include": [

package/dist/Command/InitElectron.js

@@ -32,10 +32,6 @@ const pathe_1 = __importDefault(require("pathe"));
 const utils_1 = require("@zwa73/utils");
 const RouteInterface_1 = require("./RouteInterface");
 const InitDataPath = pathe_1.default.join(RouteInterface_1.DATA_PATH, 'CreateElectronFrame');
-(async () => {
-    const filelist = await fs.promises.readdir(InitDataPath);
-    console.log(filelist);
-})();
 /**复制基础文件 */
 async function copyData() {
     const filelist = await fs.promises.readdir(InitDataPath);

package/dist/UtilDevTool.js

@@ -70,13 +70,10 @@ var UtilDT;
             .addSourceFileAtPath(fp)
             .getDescendantsOfKind(ts_morph_1.SyntaxKind.TypeAliasDeclaration)
             .map(d => d.getName())).flat();
-        //console.log(types)
         const list = gener.getUserSymbols()
             .filter(t => types.some(i => i === t))
             .filter(t => it.some(i => i.test(t)))
             .filter(t => !et.some(i => i.test(t)));
-        //console.log(list)
-        //await UtilFT.writeJSONFile('testout',list);
         const schema = gener.getSchemaForSymbols(list);
         const outDir = opt?.outDir ?? pathe_1.default.join(process.cwd(), 'schema');
         const schemasPath = pathe_1.default.join(outDir, 'schemas.json');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.64",
+	"version": "1.0.66",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {

package/scripts/postinstall.js

@@ -1,6 +1,5 @@
 const path = require('path');
-const { UtilFT, SLogger } = require("@zwa73/utils");
-const readline = require('readline');
+const { UtilFT } = require("@zwa73/utils");
 
 const PACKAGE_PATH = path.join(__dirname,'..','package.json');
 const VERSION_PATH = path.join(__dirname,"..","..","version.json");
@@ -26,11 +25,10 @@ function showUpgradeMessages(prevVersion, currentVersion) {
     // 遍历infoTable中的所有版本
     for (const version in INFO_TABLE) {
         const versionNumber = versionToNumber(version);
-        //console.log(versionNumber,prevVersionNumber,currentVersionNumber)
         // 如果用户的上一个版本低于这个版本，而当前版本高于或等于这个版本
         if (versionNumber > prevVersionNumber && versionNumber <= currentVersionNumber) {
             // 显示这个版本的提示信息
-            console.log(INFO_TABLE[version]);
+            process.stdout.write(INFO_TABLE[version]);
             hasOut=true;
         }
     }
@@ -43,21 +41,13 @@ async function main(){
     const currentVersion = packageTable.version;
     await UtilFT.ensurePathExists(VERSION_PATH);
     const versionTable = await UtilFT.loadJSONFile(VERSION_PATH,{default:{}});
-    const prevVersion = versionTable[PKG_NAME]?.version ?? "0.0.0";
+    const prevVersion = versionTable[PKG_NAME]?.version ?? "10000.0.0";
 
-    console.log(`${currentVersion} 版本已安装`);
+    process.stdout.write(`${currentVersion} 版本已安装`);
     // 使用这个函数来显示升级信息
     const hasOut = showUpgradeMessages(prevVersion, currentVersion);
 
     const ntable = Object.assign({},versionTable,{[PKG_NAME]:{version:currentVersion}});
     await UtilFT.writeJSONFile(VERSION_PATH, ntable);
-
-    if(!hasOut) return;
-    const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-    });
-    setTimeout(()=>rl.close(),5000);
-    rl.question('按任意键继续...', () => rl.close());
 }
 main()

package/src/Command/InitElectron.ts

@@ -9,13 +9,6 @@ import { checkProject, DATA_PATH, MIRROR_SOURCE, PROJECT_PATH } from './RouteInt
 
 const InitDataPath = path.join(DATA_PATH,'CreateElectronFrame');
 
-(async ()=>{
-
-    
-    const filelist = await fs.promises.readdir(InitDataPath);
-    console.log(filelist);
-})();
-
 /**复制基础文件 */
 async function copyData() {
     const filelist = await fs.promises.readdir(InitDataPath);

package/src/UtilDevTool.ts

@@ -74,13 +74,10 @@ export async function generateSchema(dir:string,opt?:BuildSchemaOpt){
         .getDescendantsOfKind(SyntaxKind.TypeAliasDeclaration)
         .map(d=>d.getName())
     ).flat();
-    //console.log(types)
     const list = gener.getUserSymbols()
             .filter(t=>types.some(i=>i===t))
             .filter(t=>it.some(i=>i.test(t)))
             .filter(t=>!et.some(i=>i.test(t)));
-    //console.log(list)
-    //await UtilFT.writeJSONFile('testout',list);
     const schema = gener.getSchemaForSymbols(list) as JObject;
     const outDir = opt?.outDir ?? path.join(process.cwd(),'schema');
     const schemasPath = path.join(outDir,'schemas.json');

package/data/CreateElectronFrame/src/Component/index.ts

@@ -1 +0,0 @@
-export * from './Base';

package/data/CreateElectronFrame/src/Static/index.ts

@@ -1,14 +0,0 @@
-import { app } from "electron";
-
-
-
-
-export const FuncObj = {
-    getAppPath() {
-        return app.getAppPath();
-    },
-    test(){
-        return 0;
-    },
-};
-export type FuncObj = typeof FuncObj;