Site cleanup, Xcode-less build restoration, Home Assistant app

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
           echo ::set-output name=TXZ_PATH::$(make where-txz 2>/dev/null | tail -n1)
       - name: Build All Apps
         run: |
-          make allapps
+          make XCODE=1 allapps
         env:
           DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
       - name: Create Package

Makefile

@@ -12,7 +12,7 @@ bundle_untracked	?= 0
 appnames			= $(patsubst $(macpin_sites)/%,%.app,$(wildcard $(macpin_sites)/*))
 
 usage help:
-	@printf '\nusage:\tmake (V=1) <target>\n\ntargets:\n%s'
+	@printf '\nusage:\tmake (V=1) (XCODE=1) <target>\n\ntargets:\n%s'
 	@printf '\t%s\n' allapps reinstall uninstall test test.app sites/*
 
 include eXcode.mk
@@ -129,6 +129,7 @@ GH_RELEASE_JSON = '{"tag_name": "v$(VERSION)","target_commitish": "master","name
 
 $(xcassets)/%.xcassets: $(macpin_sites)/%/icon.png
 	$(swiftrun_mac) iconify $(icontypes) $< $@
+	iconutil --convert icns $@/Icon.iconset
 
 $(xcassets)/%.xcassets: templates/xcassets/$(platform)/%/*.png
 	for i in $^; do $(swiftrun_mac) iconify --imageset $$i $@; done
@@ -258,6 +259,7 @@ $(appdir)/%.app/Assets.car: $(xcassets)/%.xcassets $(xcassets)/icons8.xcassets
 	xcrun actool --output-format human-readable-text --notices --warnings --print-contents --output-partial-info-plist $@.plist \
 		--platform $(sdk) --minimum-deployment-target $(target_ver_ios)  --target-device iphone  --target-device ipad --app-icon AppIcon \
 		--compress-pngs --compile $(dir $@) $(realpath $(filter %.xcassets, $^)) > /dev/null
+	cp $(realpath $(filter %.xcassets, $^)/Icon.icns) $(dir $@)/
 	test -f $@ || { echo "error: $@ was not created by actool!" && cat $@.plist && exit 1; }
 
 $(appdir)/%.app/LaunchScreen.nib: templates/$(platform)/LaunchScreen.xib

README.md

@@ -29,6 +29,9 @@ Custom URL schemes can also be registered to launch a MacPin App from any other
 
 ## Included Apps in the [Release](https://github.com/kfix/MacPin/releases)
 
+### selfhosterings
+* [Home Assistant.app](https://my.home-assistant.io)
+
 ### Gooblers
 * [Google Drive.app](https://drive.google.com)
 * [Google Photos.app](https://photos.google.com)
@@ -38,7 +41,7 @@ Custom URL schemes can also be registered to launch a MacPin App from any other
 
 ### MetaVerses
 * [Facebook.app](https://m.facebook.com/home.php) (mobile version!)
-* [Messenger.app](https://www.messenger.com/hangouts)
+* [Messenger.app](https://www.messenger.com/)
 * [WhatsApp.app](https://web.whatsapp.com)
 
 ### et cetera
@@ -95,7 +98,8 @@ app.on('AppFinishedLaunching', function() {
 ```
 
 ## Hacking MacPin
-Building `main` branch requires [macOS 13 "Ventura" with Xcode 14+](https://developer.apple.com/xcode/system-requirements/).
+Building `main` branch requires [macOS 13 "Ventura" with Xcode 14+](https://developer.apple.com/xcode/system-requirements/).  
+Later versions of macOS can build with the [Command Line Tools](https://developer.apple.com/documentation/xcode/installing-the-command-line-tools#Install-the-Command-Line-Tools-package-in-Terminal).
 
 All other branches are obsolete & archived for users locked on older macOS (hardware),  
 but they will recieve no updates.  

Sources/MacPin/WebView.swift

@@ -682,6 +682,11 @@ final class MPWebView: WKWebView, WebViewScriptExports {
 			configuration.processPool = configuration.processPool ?? (MPWebView.self.sharedWebProcessPool)!
 		}
 
+		// if makeInsecure:
+		//configuration.processPool._registerURLSchemeAsSecure("http")
+		//configuration.processPool._registerURLSchemeAsBypassingContentSecurityPolicy("http")
+		//configuration.processPool._registerURLSchemeAsBypassingContentSecurityPolicy("https")
+
 		self.init(frame: CGRect.zero, configuration: configuration) // This is the real init()
 		// its an ObjC++ ctor which is why we couldn't override its impl to do these defaultings
 
@@ -702,6 +707,7 @@ final class MPWebView: WKWebView, WebViewScriptExports {
 		if let context = context {
 			"http".withCString { http in
 				WKContextRegisterURLSchemeAsBypassingContentSecurityPolicy(context, WKStringCreateWithUTF8CString(http)) // FIXME: makeInsecure() toggle!
+				WKContextRegisterURLSchemeAsSecure(context, WKStringCreateWithUTF8CString(http)) // FIXME: makeInsecure() toggle!
 			}
 			"https".withCString { https in
 				WKContextRegisterURLSchemeAsBypassingContentSecurityPolicy(context, WKStringCreateWithUTF8CString(https))

eXcode.mk

@@ -70,16 +70,11 @@ verbose				?=
 ###################
 # swift scaffolding
 ###################
-# https://github.com/apple/swift-driver
-ifeq (1,$(CLTOOLS))
+ifneq (1,$(XCODE))
 sdkpath				:= /$(shell pkgutil --volume / --only-dirs --regexp --files com.apple.pkg.CLTools.* | grep -m1 -E SDKs/MacOSX\\d+.*.sdk$$)
 $(info [$(eXcode)] $$(sdkpath) := $(sdkpath))
 swiftc				:= /$(shell pkgutil --volume / --only-dirs --files com.apple.pkg.CLTools_Executables | grep -m1 usr/bin$$)/swiftc -sdk $(sdk) -target $(arch)-$(target_$(platform)) $(verbose)
-
-# not a thing anymore
-#swiftbuildbin		:= /$(patsubst %-build,%,$(shell pkgutil --volume / --only-files --files com.apple.pkg.CLTools_Executables | grep -m1 bin/swift-build$$))
 swiftbuildbin		:= /usr/bin/swift
-### XXX: appears CLTools doesn't ship SPM libraries yet, so Package.swift can't be compiled
 else
 sdkpath				:= $(shell xcrun --show-sdk-path --sdk $(sdk))
 swiftc				:= xcrun -sdk $(sdk) swiftc -target $(arch)-$(target_$(platform)) $(verbose)

modules/WebKitPrivates/WKProcessPoolPrivate.h

@@ -35,6 +35,11 @@
 //- (void)_automationCapabilitiesDidChange WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
 //- (void)_setAutomationSession:(_WKAutomationSession *)automationSession WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
 
+- (void)_registerURLSchemeAsCanDisplayOnlyIfCanRequest:(NSString *)scheme WK_API_AVAILABLE(macos(10.14), ios(12.0));
+- (void)_registerURLSchemeAsSecure:(NSString *)scheme WK_API_AVAILABLE(macos(12.0), ios(15.0));
+- (void)_registerURLSchemeAsBypassingContentSecurityPolicy:(NSString *)scheme WK_API_AVAILABLE(macos(12.0), ios(15.0));
+- (void)_setDomainRelaxationForbiddenForURLScheme:(NSString *)scheme WK_API_AVAILABLE(macos(12.0), ios(15.0));
+
 // Test only. Returns web processes running web pages (does not include web processes running service workers)
 - (size_t)_webPageContentProcessCount WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
 

sites/Facebook/app.js

@@ -10,9 +10,10 @@
 var delegate = {}; // our delegate to receive events from the webview app
 var fbTab, fb = {
 		url: "https://m.facebook.com/home.php",
-		preinject: ['unpreloader'], // this prevents buffering every video in a feed. If you have a fast Mac and Internet, comment out this line
+		useSystemAppearance: true,
+		//preinject: ['unpreloader'], // this prevents buffering every video in a feed. If you have a fast Mac and Internet, comment out this line
 		//postinject: ['styler'], agent: "Mozilla/5.0 (iPad; CPU OS 8_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B410 Safari/600.1.4"
-		agent: "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.2311.38 Mobile Safari/537.36" //news-feed on Chromedroid is full-width
+		//agent: "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.2311.38 Mobile Safari/537.36" //news-feed on Chromedroid is full-width
 };
 fbTab = $.browser.tabSelected = new $.WebView(fb);
 $.browser.addShortcut("Facebook Home", fb);
@@ -21,9 +22,6 @@ delegate.setAgent = function(agent) { $.browser.tabSelected.userAgent = agent; }
 $.browser.addShortcut('UA: Android 5 / Chrome 36', ["setAgent", "Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.2311.38 Mobile Safari/537.36"]);
 // FB sets margin-* to be 0 on a bunch of elements (header jewels) for chr36
 
-let enDarken = require('enDarken.js');
-$.browser.addShortcut('Dark Mode', [], enDarken);
-
 function search(query) {
 	$.browser.tabSelected = fbTab;
 	//fbTab.load_url("https://m.facebook.com/graphsearch/str/" + query + "/keywords_top?ref=content_filter&source=typeahead")
@@ -58,7 +56,7 @@ delegate.handleUserInputtedInvalidURL = function(query) {
 };
 
 delegate.AppFinishedLaunching = function() {
-	$.app.registerURLScheme('facebook');
+	//$.app.registerURLScheme('facebook');
 	//$.app.registerURLScheme('fb'); // claimed by AddressBookUrlForwarder.app http://apple.stackexchange.com/a/105047
 	//`open -a AddressBookUrlForwarder.app fb://profile/4` to see the Zuckster in safari ...
 

sites/Google_Calendar/app.js

@@ -10,6 +10,7 @@
 var delegate = {}; // our delegate to receive events from the webview app
 var calTab, calendar = {
 	transparent: false,
+	useSystemAppearance: true,
 	url: "https://calendar.google.com"
 };
 var calendarAlt = Object.assign({}, calendar, {url: "https://calendar.google.com/calendar/b/1"});
@@ -144,6 +145,7 @@ delegate.decideNavigationForURL = function(url, tab) {
 				!addr.startsWith("//www.youtube.com") && // yt vids are usually embedded players
 				!addr.startsWith("//youtube.googleapis.com/embed/") &&
 				!addr.startsWith("//www.google.com/a/") &&
+				!addr.startsWith("//ogs.google.com") &&
 				!addr.startsWith("//myaccount.google.com") &&
 				!addr.startsWith("//www.google.com/tools/feedback/content_frame") &&
 				!addr.startsWith("//www.google.com/settings")
@@ -174,8 +176,6 @@ delegate.handleDragAndDroppedURLs = function(urls) {
 	}
 }
 
-let enDarken = require('enDarken.js');
-
 delegate.AppFinishedLaunching = function() {
 	//$.app.registerURLScheme('gcalendar');
 	//$.app.registerUTI('dyn.???'); // *.ical
@@ -197,7 +197,6 @@ delegate.AppFinishedLaunching = function() {
 		);
 	}
 
-	$.browser.addShortcut('Paint It Black', [], enDarken);
 
 };
 delegate; //return this to macpin

sites/Google_Chat/main.js

@@ -8,23 +8,22 @@ let browser = new BrowserWindow();
 
 const chat = {
 	url: "https://chat.google.com",
+	useSystemAppearance: true
 };
-let chatTab = new WebView(chat); // start loading right way, its a big Closure app
+let chatTab = new WebView(chat); // start loading right way, its a big app
 
 function unhideApp(tab) {
 	if (tab) browser.tabSelected = tab;
 	browser.unhideApp();
 };
 
-const enDarken = require('enDarken.js');
-
 const setAgent = function(agent, tab) { tab.userAgent = agent; };
 // looks like a reload has to be done for this to take full effect.
 
 app.on("decideNavigationForClickedURL", function(url, tab, mainFrame) {
 	if (
 		!url.startsWith("https://accounts.google.com")
-		&& !url.startsWith("https://hangouts.google.com")
+		&& !url.startsWith("https://ogs.google.com")
 		&& !url.startsWith("https://www.google.com/a/")
 		&& !url.startsWith("https://g.co")
 		) { // open all links externally except those above
@@ -57,11 +56,9 @@ app.on('handleClickedNotification', (note) => {
 
 app.on('AppWillFinishLaunching', (AppUI) => {
 	browser.addShortcut("Log into Google Account", "https://accounts.google.com/signin");
-	browser.addShortcut('Dark Mode', [], enDarken);
 	browser.addShortcut('UA: default', [false], setAgent);
 
 	AppUI.browserController = browser; // make sure main app menu can get at our shortcuts
-	enDarken(chatTab);
 });
 
 

sites/Google_Drive/app.js

@@ -9,7 +9,8 @@
 
 var delegate = {}; // our delegate to receive events from the webview app
 var driveTab, drive = {
-	url: "https://drive.google.com"
+	url: "https://drive.google.com",
+	useSystemAppearance: true,
 };
 var driveAlt = Object.assign({}, drive, {url: "https://drive.google.com/drive/u/1"});
 var sheets = Object.assign({}, drive, {url: "https://docs.google.com/spreadsheets/"});
@@ -142,6 +143,7 @@ delegate.decideNavigationForURL = function(url, tab) {
 				!addr.startsWith("//www.youtube.com") && // yt vids are usually embedded players
 				!addr.startsWith("//youtube.googleapis.com/embed/") &&
 				!addr.startsWith("//www.google.com/a/") &&
+				!addr.startsWith("//ogs.google.com") &&
 				!addr.startsWith("//myaccount.google.com") &&
 				!addr.startsWith("//www.google.com/tools/feedback/content_frame") &&
 				!addr.startsWith("//www.google.com/settings")
@@ -172,8 +174,6 @@ delegate.handleDragAndDroppedURLs = function(urls) {
 	}
 }
 
-let enDarken = require('enDarken.js');
-
 delegate.AppFinishedLaunching = function() {
 	$.app.registerURLScheme('gdrive');
 	//$.app.registerURLScheme('googledrive'); //iOS
@@ -187,7 +187,6 @@ delegate.AppFinishedLaunching = function() {
 	$.browser.addShortcut('Presentations', presentation);
 	$.browser.addShortcut("Add a Google log-in", 'https://accounts.google.com/AddSession');
 	$.browser.addShortcut('Use next Google log-in', ['gotoNextGoogleAccount']);
-	$.browser.addShortcut("Install 'Open in Google Drive app' service", `http://github.com/kfix/MacPin/tree/master/extras/${escape('Open in Google Drive app.workflow')}`);
 	$.browser.addShortcut('Enable Redirection to external domains', ['toggleRedirection', true]);
 	$.browser.addShortcut('Disable Redirection (default)', ['toggleRedirection', false]);
 
@@ -201,8 +200,5 @@ delegate.AppFinishedLaunching = function() {
 			}
 		);
 	}
-
-	$.browser.addShortcut('Paint It Black', [], enDarken);
-
 };
 delegate; //return this to macpin

sites/Google_Maps/app.js

@@ -6,6 +6,7 @@
 var delegate = {}; // our delegate to receive events from the webview app
 var mapsTab, maps = {
 	url: "https://maps.google.com",
+	useSystemAppearance: true,
 	allowsMagnification: false // lets gmaps JS handle pinch-zooms
 };
 var mapsAlt = Object.assign({}, maps, {url: "https://www.google.com/maps/?authuser=1"});
@@ -59,6 +60,8 @@ delegate.decideNavigationForURL = function(url, tab) {
 			if (!addr.startsWith("//maps.google.com") &&
 				!addr.startsWith("//google.com/maps/") &&
 				!addr.startsWith("//accounts.google.com") &&
+				!addr.startsWith("//accounts.youtube.com") &&
+				!addr.startsWith("//ogs.google.com") &&
 				!addr.startsWith("//www.google.com/a/") &&
 				!addr.startsWith("//places.google.com") &&
 				!addr.startsWith("//plus.google.com") &&
@@ -99,8 +102,6 @@ delegate.handleDragAndDroppedURLs = function(urls) {
 	}
 }
 
-let enDarken = require('enDarken.js');
-
 delegate.AppFinishedLaunching = function() {
 	$.app.registerURLScheme('gmaps');
 	//$.app.registerURLScheme('googlemaps'); //IOS?
@@ -113,7 +114,6 @@ delegate.AppFinishedLaunching = function() {
 	$.browser.addShortcut('Google Maps API Team blog', "http://googlegeodevelopers.blogspot.com");
 	$.browser.addShortcut('Classic gMaps', "http://gokml.net/maps");
 	$.browser.addShortcut("Install 'Show Address in Google Maps app' service", `http://github.com/kfix/MacPin/tree/master/extras/${escape('Show Address in Google Maps app.workflow')}`);
-	$.browser.addShortcut('Dark Mode', [], enDarken);
 
 	// TODO: add "Open in Apple Maps", send it http://maps.apple.com lat & long
 	// https://developer.apple.com/library/ios/featuredarticles/iPhoneURLScheme_Reference/MapLinks/MapLinks.html

sites/Google_Voice/main.js

@@ -8,6 +8,7 @@ let browser = new BrowserWindow();
 
 const voice = {
 	url: "https://voice.google.com",
+	useSystemAppearance: true,
 	postinject: ["automators"]
 };
 let voiceTab = new WebView(voice); // start loading right away, it's a big app
@@ -23,12 +24,9 @@ const setAgent = function(agent, tab) { tab.userAgent = agent; };
 app.on("decideNavigationForClickedURL", function(url, tab, mainFrame) {
 	if (
 		!url.startsWith("https://talkgadget.google.com")
+		&& !url.startsWith("https://ogs.google.com")
 		&& !url.startsWith("https://accounts.google.com")
-		&& !url.startsWith("https://hangouts.google.com")
-		&& !url.startsWith("https://plus.google.com/hangouts/")
 		&& !url.startsWith("https://www.google.com/a/")
-		&& !url.startsWith(meet.url)
-		&& !url.startsWith(allo.url)
 		&& !url.startsWith(voice.url)
 		&& !url.startsWith("https://g.co")
 		) { // open all links externally except those above
@@ -77,7 +75,7 @@ app.on('handleUserInputtedInvalidURL', function(query, tab) {
 	return false;
 });
 
-app.on('launchURL', function(url) { // app.openURL(/[sms|hangouts|tel]:.*/) calls this
+app.on('launchURL', function(url) { // app.openURL(/[sms|tel]:.*/) calls this
 	console.log("app.js: launching " + url);
 	var comps = url.split(':'),
 		scheme = comps.shift(),