[scramjet/core] fix optional postmessage call

Author: velzie

packages/scramjet/packages/controller/src/index.ts

@@ -117,7 +117,7 @@ export class Controller {
 
 						let payload = "";
 						payload +=
-							"console.warn('WTF'); if ('document' in self && document.currentScript) { document.currentScript.remove(); }\n";
+							"if ('document' in self && document.currentScript) { document.currentScript.remove(); }\n";
 						payload += `self.WASM = '${b64}';`;
 						wasmPayload = payload;
 					}

packages/scramjet/packages/core/rewriter/js/src/changes.rs

@@ -52,7 +52,12 @@ pub enum JsChangeType<'alloc: 'data, 'data> {
 	},
 
 	/// insert `$wrapPostMessage(`
-	WrapPostMessage,
+	WrapPostMessageLeft,
+
+	/// insert `)`, or `)?.` if optional
+	WrapPostMessageRight {
+		optional: bool,
+	},
 	/// insert `$scramerr(ident);`
 	ScramErrFn {
 		ident: Atom<'data>,
@@ -236,7 +241,14 @@ impl<'alloc: 'data, 'data> Transform<'data> for JsChange<'alloc, 'data> {
 				let steps: &'static str = Box::leak(steps.into_boxed_str());
 				LL::insert(transforms![",", &cfg.tempunusedid, "=(", &steps, "0)"])
 			}
-			Ty::WrapPostMessage => LL::insert(transforms![&cfg.wrappostmessagefn, "("]),
+			Ty::WrapPostMessageLeft => LL::insert(transforms![&cfg.wrappostmessagefn, "("]),
+			Ty::WrapPostMessageRight { optional } => LL::replace(
+				if optional {
+					transforms![")?."]
+				} else {
+					transforms![")"]
+				}
+			),
 			Ty::ScramErrFn { ident } => LL::insert(transforms!["$scramerr(", ident, ");"]),
 			Ty::ScramitizeFn => LL::insert(transforms![" $scramitize("]),
 			Ty::EvalRewriteFn => LL::insert(transforms![&cfg.rewritefn, "("]),

packages/scramjet/packages/core/rewriter/js/src/rewrite.rs

@@ -22,6 +22,7 @@ pub(crate) enum RewriteType<'alloc: 'data, 'data> {
 	/// `wrapPostMessage(object)`
 	WrapPostMessage {
 		inner: Span,
+		optional: bool,
 	},
 
 	/// `(cfg.importfn("cfg.base"))`
@@ -232,12 +233,10 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 					location_assigned
 				}
 			)],
-			Self::WrapPostMessage { inner } => smallvec![change!(span!(start), WrapPostMessage), change!(
+			Self::WrapPostMessage { inner, optional } => smallvec![change!(span!(start), WrapPostMessageLeft), change!(
 				inner,
-				ClosingParen {
-					semi: false,
-					replace: true
-				}
+				// ClosingParen { semi: false, replace: true }
+				WrapPostMessageRight { optional }
 			)],
 			Self::SetRealmFn => smallvec![change!(span, SetRealmFn)],
 			Self::ImportFn => smallvec![change!(span, ImportFn)],

packages/scramjet/packages/core/rewriter/js/src/visitor.rs

@@ -485,8 +485,9 @@ where
 
 					self.jschanges.add(rewrite!(s.span, WrapPostMessage {
 						inner: Span::new(s.property.span.start - offset, s.property.span.end),
+						optional: s.optional,
 					}));
-					
+
 					walk::walk_expression(self, &s.object);
 					return; // unwise to walk the rest of the tree
 				}

packages/scramjet/packages/core/src/client/shared/postmessage.ts

@@ -84,6 +84,7 @@ export default function (client: ScramjetClient, self: Self) {
 	});
 	Object.defineProperty(self, client.config.globals.wrappostmessagefn, {
 		value: function (obj: any) {
+			if (!obj || typeof obj.postMessage !== "function") return obj;
 			return obj.postMessage.bind(obj);
 		},
 		configurable: false,