feat: fix not working in Ubuntu 20.04 ( Boscop/web-view#289 )

js-lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wv-linewise-js-lib",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/forbesmyester/wv-linewise"
@@ -14,7 +14,9 @@
   },
   "author": "Matt Forrester <[email protected]>",
   "license": "MIT",
-  "dependencies": {},
+  "dependencies": {
+    "typescript-language-server": "^0.5.1"
+  },
   "typings": "./dist/main.d.ts",
   "devDependencies": {
     "@rollup/plugin-typescript": "^4.1.2",

js-lib/src/wv-linewise-fetch.ts

@@ -281,9 +281,7 @@ export function getWvLinewiseFetch(wvl: WvLinewise, responseStream: string) {
 
     function wvLinewiseFetchSerialize(request: WvLinewiseRequest): string {
         let m = (request.opts.method || 'GET').toUpperCase();
-        let o = {...request.opts};
-        delete o.method;
-        return `REQUEST: ${request.id}: ${m}: ${request.url} ${JSON.stringify(o)}`;
+        return `REQUEST: ${request.id}: ${m}: ${request.url} ${request.opts.body || '{}'}`;
     }
 
     wvLinewiseFetch.request = wvLinewiseFetchRequest;

js-lib/src/wv-linewise.ts

@@ -412,6 +412,29 @@ export class WvLinewise {
 }
 
 export function runningInWvLinewise(): boolean {
+
+    if ((window as any).webkit && (window as any).webkit.messageHandlers && (window as any).webkit.messageHandlers.external && (window as any).webkit.messageHandlers.external.postMessage) {
+        (window as any).external = {
+            invoke: (e: string) => {
+                (window as any).webkit.messageHandlers.external.postMessage(e);
+            }
+        };
+        return true;
+    }
+
     return !!((window as any).external && (window.external as any).invoke);
 }
 
+export function externalInvoke(e: any) {
+
+    if ((window as any).webkit && (window as any).webkit.messageHandlers && (window as any).webkit.messageHandlers.external && (window as any).webkit.messageHandlers.external.postMessage) {
+        return (window as any).webkit.messageHandlers.external.postMessage(e);
+    }
+
+    if ((window as any).external && (window.external as any).invoke) {
+        return (window.external as any).invoke(e);
+    }
+
+    throw new Error("WV Linewise: Could not post message: " + JSON.stringify(e));
+}
+

js-lib/test/wv-linewise-fetch.ts

@@ -61,7 +61,11 @@ tap.test('testSerialize', function testSerialize(test) {
 
     test.is(
         fet.serialize({ opts: { cache: "no-cache", method: "post", body: JSON.stringify({ a: 2 }) }, id: 3, url: '/snow' }),
-        'REQUEST: 3: POST: /snow {"cache":"no-cache","body":"{\\"a\\":2}"}'
+        'REQUEST: 3: POST: /snow {"a":2}'
+    );
+    test.is(
+        fet.serialize({ opts: { cache: "no-cache", method: "get" }, id: 3, url: '/snow' }),
+        'REQUEST: 3: GET: /snow {}'
     );
     test.end()