win_webview2 1.1.20 → 1.1.22

package/dist/browser/runVirtualDirBrowser.d.ts

@@ -1 +1,7 @@
-export declare function callVirtualDirFunction(funName: string, param: string): Promise<unknown>;
+export declare function callVirtualDirFunction(arg: {
+    funName: string;
+    params: object;
+}): Promise<{
+    err: string;
+    data: object;
+}>;

package/dist/browser/runVirtualDirBrowser.js

@@ -1,36 +1,11 @@
-let registerListenerReady = false;
-let funRegistred = {};
-function registerListener() {
-    if (registerListenerReady)
-        return;
-    // @ts-ignore
-    window.chrome.webview.addEventListener('message', function (event) {
-        let data = event.data;
-        try {
-            let jobj = JSON.parse(data);
-            funRegistred[jobj.replyFun](jobj.data);
-        }
-        catch (error) {
-            console.log("messageError ", error);
-        }
-    });
-    registerListenerReady = true;
-}
-export function callVirtualDirFunction(funName, param) {
-    let ranNumber = Date.now();
-    let replyFun = funName + ranNumber;
-    registerListener();
-    let jsonPost = {
-        funName: funName,
-        data: param,
-        replyFun: replyFun
-    };
-    // @ts-ignore
-    window.chrome.webview.postMessage(JSON.stringify(jsonPost));
-    return new Promise((r, x) => {
-        funRegistred[replyFun] = (msg) => {
-            delete funRegistred[replyFun];
-            r(msg);
-        };
+export async function callVirtualDirFunction(arg) {
+    let response = await fetch("/ww2_postmethod", {
+        method: "POST",
+        body: JSON.stringify(arg),
+        headers: {
+            "Content-Type": "application/json"
+        },
     });
+    let result = await response.json();
+    return result;
 }

package/dist/node/tsExport/downloadModule.d.ts

@@ -1,6 +1,16 @@
 import { WwvPlatFrom } from "./ww2_config";
+interface ResourceRequest {
+    uri: string;
+    method: string;
+    body: Uint8Array;
+}
+interface ResourceResponse {
+    status: number;
+    contentType: string;
+    body: Uint8Array;
+}
 export interface Ww2WebConfig {
-    callback: (err: any, data: any) => void;
+    onClose: (err: any, data: any) => void;
     wclassname: string;
     url: string;
     title: string;
@@ -9,8 +19,8 @@ export interface Ww2WebConfig {
     isKiosk: boolean;
     isMaximize: boolean;
     isDebug: boolean;
-    virtualHostNameToFolderMapping?: string;
-    onPostMessage: (msg: string, reply: (msg: string) => void) => void;
+    virtualHostName?: string;
+    onVirtualHostRequested?: (req: ResourceRequest, reply: (res: ResourceResponse) => void) => void;
 }
 interface WW2FileDialogArg {
     callback: (err: any, data: any) => void;
@@ -25,7 +35,7 @@ export interface WW2ControlWindowsArg {
     height?: number;
     width?: number;
 }
-interface Ww2Module {
+export interface Ww2Module {
     openWeb: (arg: Ww2WebConfig) => void;
     openFileDialog: (arg: WW2FileDialogArg) => void;
     openFolderDialog: (arg: WW2FileDialogArg) => void;

package/dist/node/tsExport/downloadModule.js

@@ -22,7 +22,7 @@ function extractZip(zipPath, targetDir) {
     }
 }
 ;
-const binFileVersion = "1.1.19";
+const binFileVersion = "1.1.21";
 async function downloadModuleFile(platform) {
     let modulePath = (0, dirnameTool_1.getWWVNodeModuleFolder)();
     let winlibPath = node_path_1.default.join(modulePath, "win_lib");

package/dist/node/tsExport/runVirtualDir/checkFile.d.ts

@@ -0,0 +1,2 @@
+import { InternalFunctionResultPromise } from "./util";
+export declare function checkFileFromVirtualFolder(htmlFolderPath: string, currentPath: string): InternalFunctionResultPromise;

package/dist/node/tsExport/runVirtualDir/checkFile.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkFileFromVirtualFolder = checkFileFromVirtualFolder;
+const node_fs_1 = require("node:fs");
+const util_1 = require("./util");
+const node_path_1 = __importDefault(require("node:path"));
+const promises_1 = require("node:fs/promises");
+async function checkFileFromVirtualFolder(htmlFolderPath, currentPath) {
+    let contentType = (0, util_1.getContentType)(currentPath);
+    let filePath = node_path_1.default.join(htmlFolderPath, currentPath);
+    if (!(0, node_fs_1.existsSync)(filePath)) {
+        return null;
+    }
+    let fileContent = await (0, promises_1.readFile)(filePath);
+    let uint8 = new Uint8Array(fileContent);
+    return {
+        content: uint8,
+        contentType
+    };
+}

package/dist/node/tsExport/runVirtualDir/checkMapFunction.d.ts

@@ -0,0 +1,9 @@
+import { InternalFunctionResultPromise } from "./util";
+export declare function checkMapFunction(arg: {
+    mapfunction: {
+        [key: string]: (msg: object) => Promise<object>;
+    };
+    body: Uint8Array;
+    method: string;
+    path: string;
+}): InternalFunctionResultPromise;

package/dist/node/tsExport/runVirtualDir/checkMapFunction.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkMapFunction = checkMapFunction;
+const util_1 = require("./util");
+async function checkMapFunction(arg) {
+    if (arg.path != "/ww2_postmethod")
+        return null;
+    if (arg.method != "POST")
+        return null;
+    if (arg.body == null)
+        return null;
+    let jsonResponse = {
+        data: null,
+        error: null
+    };
+    try {
+        let bodyString = (0, util_1.byteArrayToString)(arg.body);
+        let bodyObject = JSON.parse(bodyString);
+        if (bodyObject.funName == null || bodyObject.funName == "")
+            throw "no method name";
+        if (!arg.mapfunction[bodyObject.funName])
+            throw "no method match";
+        jsonResponse.data = await arg.mapfunction[bodyObject.funName](bodyObject.params);
+    }
+    catch (error) {
+        jsonResponse.error = error;
+    }
+    let serverResponse = null;
+    try {
+        let responseText = JSON.stringify(jsonResponse);
+        serverResponse = {
+            content: (0, util_1.byteArrayFromString)(responseText),
+            contentType: "application/json"
+        };
+    }
+    catch (error) {
+        console.log(error);
+    }
+    return serverResponse;
+}

package/dist/node/tsExport/runVirtualDir/checkWW2.d.ts

@@ -0,0 +1,8 @@
+import { Ww2Module } from "../downloadModule";
+import { InternalFunctionResultPromise } from "./util";
+export declare function checkWw2BrowserFunction(arg: {
+    path: string;
+    method: string;
+    body: Uint8Array;
+    ww2Module: Ww2Module;
+}): InternalFunctionResultPromise;

package/dist/node/tsExport/runVirtualDir/checkWW2.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkWw2BrowserFunction = checkWw2BrowserFunction;
+const util_1 = require("./util");
+async function checkWw2BrowserFunction(arg) {
+    if (arg.path != "/ww2_post")
+        return null;
+    if (arg.method != "POST")
+        return null;
+    if (arg.body == null)
+        return null;
+    let result = null;
+    try {
+        let resultText = "";
+        let bodyString = (0, util_1.byteArrayToString)(arg.body);
+        let body = JSON.parse(bodyString);
+        let ww2Module = arg.ww2Module;
+        if (body.openWeb) {
+            let openWebArg = body.openWeb;
+            ww2Module.openWeb({
+                onClose: () => {
+                },
+                height: openWebArg.height,
+                wclassname: openWebArg.wclassname,
+                isDebug: openWebArg.isDebug,
+                isKiosk: openWebArg.isKiosk,
+                isMaximize: openWebArg.isMaximize,
+                title: openWebArg.title,
+                url: openWebArg.url,
+                width: openWebArg.width
+            });
+            resultText = "open web";
+        }
+        else if (body.controlWindow) {
+            ww2Module.controlWindow(body.controlWindow);
+            resultText = "controlWindow";
+        }
+        else if (body.openFileDialog) {
+            let openFileDialogArg = body.openFileDialog;
+            resultText = await new Promise((r, x) => {
+                ww2Module.openFileDialog({
+                    callback: (err, d) => {
+                        r(d);
+                    },
+                    filter: openFileDialogArg.filter,
+                    ownerClassName: openFileDialogArg.ownerClassName
+                });
+            });
+        }
+        else if (body.openFolderDialog) {
+            let ofArg = body.openFolderDialog;
+            resultText = await new Promise((r, x) => {
+                ww2Module.openFolderDialog({
+                    callback: (err, data) => {
+                        r(data);
+                    },
+                    filter: ofArg.filter,
+                    ownerClassName: ofArg.ownerClassName
+                });
+            });
+        }
+        let jsonStrResponse = JSON.stringify({
+            error: null,
+            result: resultText
+        });
+        result = {
+            content: (0, util_1.byteArrayFromString)(jsonStrResponse),
+            contentType: "application/json"
+        };
+    }
+    catch (error) {
+    }
+    return result;
+}

package/dist/node/tsExport/runVirtualDir/runVirtualDir.d.ts

@@ -0,0 +1,7 @@
+import { Ww2WebConfig } from "../downloadModule";
+export declare function runVirtualDir(config: Omit<Ww2WebConfig, "onVirtualHostRequested" | "url" | "virtualHostName"> & {
+    mapFunction: {
+        [key: string]: (msg: object) => Promise<object>;
+    };
+    htmlFolderPath: string;
+}): void;

package/dist/node/tsExport/runVirtualDir/runVirtualDir.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runVirtualDir = runVirtualDir;
+const downloadModule_1 = require("../downloadModule");
+const winwebview2_1 = require("../winwebview2");
+const util_1 = require("./util");
+const checkFile_1 = require("./checkFile");
+const checkWW2_1 = require("./checkWW2");
+const checkMapFunction_1 = require("./checkMapFunction");
+function runVirtualDir(config) {
+    (0, downloadModule_1.getModule)().then((wwvModule) => {
+        (0, winwebview2_1.closeSplash)();
+        let hostname = "https://myapp.local";
+        let wwvConfig = {
+            onClose: config.onClose,
+            height: config.height,
+            width: config.width,
+            wclassname: config.wclassname,
+            isDebug: config.isDebug,
+            isKiosk: config.isKiosk,
+            isMaximize: config.isMaximize,
+            virtualHostName: hostname,
+            url: hostname,
+            onVirtualHostRequested: async (req, response) => {
+                try {
+                    let parsedUrl = new URL(req.uri, hostname);
+                    let cleanPath = parsedUrl.pathname;
+                    if (cleanPath == "/" || cleanPath == "")
+                        cleanPath = "index.html";
+                    console.log(cleanPath);
+                    let serverResponse = await (0, checkFile_1.checkFileFromVirtualFolder)(config.htmlFolderPath, cleanPath);
+                    if (serverResponse == null) {
+                        serverResponse = await (0, checkWW2_1.checkWw2BrowserFunction)({
+                            body: req.body,
+                            method: req.method,
+                            path: cleanPath,
+                            ww2Module: wwvModule
+                        });
+                    }
+                    if (serverResponse == null) {
+                        serverResponse = await (0, checkMapFunction_1.checkMapFunction)({
+                            body: req.body,
+                            mapfunction: config.mapFunction,
+                            method: req.method,
+                            path: cleanPath
+                        });
+                    }
+                    if (serverResponse != null) {
+                        response({
+                            body: serverResponse.content,
+                            contentType: serverResponse.contentType,
+                            status: 200
+                        });
+                        return;
+                    }
+                    response({
+                        body: (0, util_1.byteArrayFromString)("no response"),
+                        contentType: "text/plain",
+                        status: 404
+                    });
+                }
+                catch (error) {
+                }
+            },
+            title: config.title,
+        };
+        wwvModule.openWeb(wwvConfig);
+    });
+}

package/dist/node/tsExport/runVirtualDir/runVirtualDirCheckWW2.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/node/tsExport/runVirtualDir/runVirtualDirCheckWW2.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/node/tsExport/runVirtualDir/runVirtualDirUtil.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/node/tsExport/runVirtualDir/runVirtualDirUtil.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/node/tsExport/runVirtualDir/util.d.ts

@@ -0,0 +1,8 @@
+export declare function byteArrayFromString(txt: string): Uint8Array<ArrayBuffer>;
+export declare function byteArrayToString(body: Uint8Array): string;
+export declare function getContentType(url: string): string;
+export interface InternalFunctionResult {
+    content: Uint8Array;
+    contentType: string;
+}
+export type InternalFunctionResultPromise = Promise<InternalFunctionResult | null>;

package/dist/node/tsExport/runVirtualDir/util.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.byteArrayFromString = byteArrayFromString;
+exports.byteArrayToString = byteArrayToString;
+exports.getContentType = getContentType;
+function byteArrayFromString(txt) {
+    const encoder = new TextEncoder();
+    const uint8Array = encoder.encode(txt);
+    return uint8Array;
+}
+function byteArrayToString(body) {
+    const decoder = new TextDecoder('utf-8');
+    const str = decoder.decode(body);
+    return str;
+}
+const mimeTypes = {
+    '.html': 'text/html',
+    '.js': 'application/javascript',
+    '.css': 'text/css',
+    '.json': 'application/json',
+    '.png': 'image/png',
+    '.jpg': 'image/jpeg',
+    '.gif': 'image/gif',
+    '.svg': 'image/svg+xml',
+    '.pdf': 'application/pdf',
+    '.zip': 'application/zip'
+};
+function getContentType(url) {
+    const ext = url.substring(url.lastIndexOf('.')).toLowerCase();
+    return mimeTypes[ext] || 'application/octet-stream';
+}

package/dist/node/tsExport/runVirtualDir.d.ts

@@ -4,9 +4,9 @@ export interface JsonMsg {
     data: string;
     replyFun: string;
 }
-export declare function runVirtualDir(config: Omit<Ww2WebConfig, "onPostMessage" | "url" | "virtualHostNameToFolderMapping"> & {
+export declare function runVirtualDir(config: Omit<Ww2WebConfig, "onVirtualHostRequested" | "url" | "virtualHostName"> & {
     mapFunction: {
         [key: string]: (msg: string) => Promise<string>;
     };
-    virtualHostNameToFolderMapping: string;
+    htmlFolderPath: string;
 }): void;

package/dist/node/tsExport/runVirtualDir.js

@@ -1,38 +1,110 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runVirtualDir = runVirtualDir;
+const node_path_1 = __importDefault(require("node:path"));
 const downloadModule_1 = require("./downloadModule");
 const winwebview2_1 = require("./winwebview2");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
+function byteArrayFromString(txt) {
+    const encoder = new TextEncoder();
+    const uint8Array = encoder.encode(txt);
+    return uint8Array;
+}
+function byteArrayToString(body) {
+    const decoder = new TextDecoder('utf-8');
+    const str = decoder.decode(body);
+    return str;
+}
+const mimeTypes = {
+    '.html': 'text/html',
+    '.js': 'application/javascript',
+    '.css': 'text/css',
+    '.json': 'application/json',
+    '.png': 'image/png',
+    '.jpg': 'image/jpeg',
+    '.gif': 'image/gif',
+    '.svg': 'image/svg+xml',
+    '.pdf': 'application/pdf',
+    '.zip': 'application/zip'
+};
+function getContentType(url) {
+    const ext = url.substring(url.lastIndexOf('.')).toLowerCase();
+    return mimeTypes[ext] || 'application/octet-stream';
+}
+async function getFile(htmlFolderPath, currentPath) {
+    let contentType = getContentType(currentPath);
+    let filePath = node_path_1.default.join(htmlFolderPath, currentPath);
+    if (!(0, node_fs_1.existsSync)(filePath)) {
+        return null;
+    }
+    let fileContent = await (0, promises_1.readFile)(filePath);
+    let uint8 = new Uint8Array(fileContent);
+    return {
+        content: uint8,
+        contentType
+    };
+}
+async function checkWw2BrowserFunction(arg) {
+    if (arg.path != "/ww2_post")
+        return null;
+    if (arg.method != "POST")
+        return null;
+    if (arg.body == null)
+        return null;
+    let result = null;
+    try {
+        let bodyString = byteArrayToString(arg.body);
+        let jsonObj = JSON.parse(bodyString);
+    }
+    catch (error) {
+    }
+    return result;
+}
 function runVirtualDir(config) {
     (0, downloadModule_1.getModule)().then((wwv) => {
         (0, winwebview2_1.closeSplash)();
-        wwv.openWeb({
-            callback: config.callback,
+        let hostname = "https://myapp.local";
+        let wwvConfig = {
+            onClose: config.onClose,
             height: config.height,
             width: config.width,
             wclassname: config.wclassname,
             isDebug: config.isDebug,
             isKiosk: config.isKiosk,
             isMaximize: config.isMaximize,
-            onPostMessage: async (msg, r) => {
+            virtualHostName: hostname,
+            url: hostname,
+            onVirtualHostRequested: async (req, response) => {
                 try {
-                    let jobj = JSON.parse(msg);
-                    if (jobj.funName == null)
-                        throw "onPostMessage no funName";
-                    let result = await config.mapFunction[jobj.funName](jobj.data);
-                    let replyObj = {
-                        funName: jobj.funName,
-                        data: result,
-                        replyFun: jobj.replyFun
-                    };
-                    r(JSON.stringify(replyObj));
+                    let parsedUrl = new URL(req.uri, hostname);
+                    let cleanPath = parsedUrl.pathname;
+                    if (cleanPath == "/")
+                        cleanPath = "index.html";
+                    console.log(cleanPath);
+                    let file = await getFile(config.htmlFolderPath, cleanPath);
+                    if (file != null) {
+                        response({
+                            body: file.content,
+                            contentType: file.contentType,
+                            status: 200
+                        });
+                        return;
+                    }
+                    response({
+                        body: byteArrayFromString("test dulu"),
+                        contentType: "text/plain",
+                        status: 200
+                    });
                 }
                 catch (error) {
                 }
             },
             title: config.title,
-            url: "",
-            virtualHostNameToFolderMapping: config.virtualHostNameToFolderMapping
-        });
+        };
+        wwv.openWeb(wwvConfig);
     });
 }

package/dist/node/tsExport/runVirtualDirCheckWW2.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/node/tsExport/runVirtualDirCheckWW2.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/node/tsExport/runVirtualDirUtil.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/node/tsExport/runVirtualDirUtil.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/node/tsExport/winwebview2.d.ts

@@ -1,7 +1,7 @@
 import { getWWVNodeModuleFolder } from "./dirnameTool";
 import { readConfig } from "./ww2_config";
 import { downloadModuleAndExtract } from "./downloadModule";
-import { runVirtualDir } from "./runVirtualDir";
+import { runVirtualDir } from "./runVirtualDir/runVirtualDir";
 export declare function closeSplash(): Promise<void>;
 export * from "./downloadModule";
 export * from "./ww2_server";

package/dist/node/tsExport/winwebview2.js

@@ -22,7 +22,7 @@ const ww2_config_1 = require("./ww2_config");
 Object.defineProperty(exports, "readConfig", { enumerable: true, get: function () { return ww2_config_1.readConfig; } });
 const downloadModule_1 = require("./downloadModule");
 Object.defineProperty(exports, "downloadModuleAndExtract", { enumerable: true, get: function () { return downloadModule_1.downloadModuleAndExtract; } });
-const runVirtualDir_1 = require("./runVirtualDir");
+const runVirtualDir_1 = require("./runVirtualDir/runVirtualDir");
 Object.defineProperty(exports, "runVirtualDir", { enumerable: true, get: function () { return runVirtualDir_1.runVirtualDir; } });
 function closeSplash() {
     return (0, downloadModule_1.getModule)().then((module) => {

package/dist/node/tsExport/ww2_server.js

@@ -21,7 +21,7 @@ async function ww2_CreateServer(arg) {
             if (body.openWeb) {
                 let openWebArg = body.openWeb;
                 ww2Module.openWeb({
-                    callback: () => {
+                    onClose: () => {
                     },
                     height: openWebArg.height,
                     wclassname: openWebArg.wclassname,
@@ -30,8 +30,7 @@ async function ww2_CreateServer(arg) {
                     isMaximize: openWebArg.isMaximize,
                     title: openWebArg.title,
                     url: openWebArg.url,
-                    width: openWebArg.width,
-                    onPostMessage: (m, r) => { }
+                    width: openWebArg.width
                 });
                 result = openWebArg.url;
             }
@@ -85,7 +84,7 @@ async function ww2_CreateServer(arg) {
         console.log("open UI");
         let uiConfig = arg.uiConfig;
         ww2Module.openWeb({
-            callback: (err, data) => {
+            onClose: (err, data) => {
                 process.exit();
             },
             wclassname: uiConfig.wclassname,
@@ -96,8 +95,6 @@ async function ww2_CreateServer(arg) {
             title: uiConfig.title,
             width: uiConfig.width,
             url: url,
-            onPostMessage: (msg, r) => {
-            },
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "win_webview2",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "repository": {
     "type": "git",
     "url": "https://github.com/nnttoo/win_webview2"