[WIP] Enable having multiple browser tabs with a single node js and (headless) chrome instance

README.md

@@ -19,7 +19,7 @@ MagicMouse runs on all platforms that run Squeak and Chrome, but works best and
 - Right-click on images and code to transform them into `Morph`s. I call those "Portals". Because portals are cool.
 - Supercharged search bar:
   - If you type something with at least one space, your search terms are googled.
-  - If you start your search with `!s `, your search terms are used to search https://squeak.org.
+  - If you start your search with `!s`, your search terms are used to search <https://squeak.org>.
 - `CTRL+L` toggles fullscreen.
 - Dropped texts are typed into form fields.
 - _browseIt_ any URL to open it in a browser.

packages/MagicMouse-Core.package/MMBrowserMorph.class/class/parseImage.into..st

@@ -0,0 +1,26 @@
+accessing
+parseImage: payload into: aMaybeUsedForm
+
+	| format png form |
+	format := payload unsignedCharAt: 2.
+	format = $r
+		ifTrue: [ | width height |
+			width := payload unsignedLongAt: 3.
+			height := payload unsignedLongAt: 7.
+			png := payload copyFrom: 11 to: payload size.
+			form := Form extent: width @ height depth: 32.
+			1 to: width * height - 1 do: [:index |
+				form bits
+					at: index
+					put: (png at: index * 4 + 3) asInteger << 0 + ((png at: index * 4 + 2) asInteger << 8) + ((png at: index * 4 + 1) asInteger << 16) + ((png at: index * 4 + 0) asInteger << 24)]]
+		ifFalse: [ | reader |
+			format caseOf: {
+				[$p] -> [
+					reader := PNGReadWriter on: (payload copyFrom: 3 to: payload size) readStream.
+					form := reader nextImage].
+				[$j] -> [
+					reader := MMFastJPEGReader on: (payload readStream
+						skip: 2;
+						yourself).
+					form := reader nextImage: aMaybeUsedForm]}].
+	^ form

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/abandon.st

@@ -0,0 +1,5 @@
+accessing
+abandon
+
+	self closeTab.
+	super abandon

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/changeLocation..st

@@ -2,4 +2,7 @@ public
 changeLocation: aUrl
 
 	location := aUrl.
-	self sendCommand: $l withBuffer: aUrl asByteArray
+	MMProcessWrapper getOSDependentSingleton
+		sendCommand: $l
+		withBuffer: aUrl asByteArray
+		for: self

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/closeTab.st

@@ -0,0 +1,4 @@
+-> to chrome
+closeTab
+
+	self tabId ifNotNil: [MMProcessWrapper getOSDependentSingleton closeTab: self tabId]

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/connect..st

@@ -1,38 +1,8 @@
 connecting
 connect: aUrl
 
-	| path arguments |
-	process := MMProcessWrapper newForOS.
-	self class debugEnabled ifTrue: [process enableDebug].
-	arguments := {
-		aUrl.
-		viewportSize x.
-		viewportSize y.
-		self class runChromeHeadless ifTrue: ['headless'] ifFalse: ['windowed'].
-		self class chromeProfilePath}.
-	self class doNotUsePrebuiltBinary
-		ifTrue: [
-			self assertNodeScriptExists.
-			path := self class gitRepositoryPath, FileDirectory slash, 'run.js'.
-			process
-				startNodeScript: path
-				arguments: arguments
-				nodeArguments: (self class debugNodejs ifTrue: [{'--inspect'}] ifFalse: [{}])]
-		ifFalse: [
-			path := (FileDirectory default / MMPluginDownloader filenameForCurrentPlatform) fullName.
-			process startCommand: path withArguments: arguments].
-
-	location := aUrl.
-
-	imageUpdaterProcess := [
-		[ | length command payload |
-			length := process stdoutNextUint32.
-			payload := process stdoutNextBuffer: length.
-			command := payload unsignedCharAt: 1.
-			command caseOf: {
-				[$i] -> [self updateImage: payload].
-				[$h] -> [self handlePortal: payload].
-				[$l] -> [self locationUpdated: payload].
-				[$s] -> [self handleStructuredData: payload].
-				[$g] -> [self handleGitClone: payload].
-				[$f] -> [self handleFormFields: payload]}] repeat] fork
+	self tabId: (MMProcessWrapper getOSDependentSingleton
+		lauchNewPageAt: aUrl
+		withExtend: self viewportSize x @ self viewportSize y
+		for: self).
+	location := aUrl

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/contentOfField.changedTo..st

@@ -13,4 +13,7 @@ contentOfField: anId changedTo: text
 		replaceFrom: 5 + id byteSize + 4
 		to: 5 + id byteSize + 4 + content byteSize - 1
 		with: content asByteArray.
-	self sendCommand: $t withBuffer: bytes
+	MMProcessWrapper getOSDependentSingleton
+		sendCommand: $t
+		withBuffer: bytes
+		for: self

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/dispose.st

@@ -1,9 +1,7 @@
 disconnecting
 dispose
 
-	process ifNotNil: [:p |
-		p terminate.
-		process := nil].
+	self closeTab.
 	imageUpdaterProcess ifNotNil: [:p |
 		p terminate.
 		imageUpdaterProcess := nil]

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/droppedDomainObject.at..st

@@ -7,4 +7,7 @@ droppedDomainObject: aDomainObject at: aPoint
 	bytes
 		signedLongAt: 1 put: aPoint x;
 		signedLongAt: 5 put: aPoint y.
-	self sendCommand: $f withBuffer: bytes
+	MMProcessWrapper getOSDependentSingleton
+		sendCommand: $f
+		withBuffer: bytes
+		for: self

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/droppedString.at..st

@@ -7,4 +7,7 @@ droppedString: aString at: aPoint
 	bytes
 		signedLongAt: 1 put: aPoint x;
 		signedLongAt: 5 put: aPoint y.
-	self sendCommand: $s withBuffer: bytes, strBuffer
+	MMProcessWrapper getOSDependentSingleton
+		sendCommand: $s
+		withBuffer: bytes, strBuffer
+		for: self

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/initialize.st

@@ -8,4 +8,5 @@ initialize
 	"Mark the image as opaque. Although we render PNGs, the browser should never send us an image of the webpage that includes transparency."
 	self isOpaque: true.
 	self image: self class logo.
-	self portalMorphs: Dictionary new
+	self portalMorphs: Dictionary new.
+	self performedAutoResizing: true

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/isConnected.st

@@ -1,4 +1,4 @@
 accessing
 isConnected
 
-	^ process notNil
+	^ self tabId notNil

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/mouseWheel..st

@@ -1,4 +1,6 @@
 events
 mouseWheel: anEvent
 
-	self sendEvent: #mouseWheel withNumber: (anEvent isWheelUp ifTrue: [0] ifFalse: [1])
+	| naturalScrollingDelta |
+	naturalScrollingDelta := anEvent wheelDelta x @ anEvent wheelDelta y negated.
+	self sendEvent: #mouseWheel withSignedPoint: naturalScrollingDelta

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/performedAutoResizing..st

@@ -0,0 +1,4 @@
+accessing
+performedAutoResizing: aBoolean
+
+	performedAutoResizing := aBoolean

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/performedAutoResizing.st

@@ -0,0 +1,4 @@
+accessing
+performedAutoResizing
+
+	^ performedAutoResizing

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/sendEvent.withBuffer..st

@@ -1,8 +1,7 @@
 -> to chrome
 sendEvent: anEventType withBuffer: aBuffer
 
-	self process
-		stdinPutUint32: aBuffer size + 2;
-		stdinPutChar: $e;
-		stdinPutUint8: (self eventTypeCode: anEventType);
-		stdinPutBuffer: aBuffer asByteArray
+	MMProcessWrapper getOSDependentSingleton
+		sendEvent: (self eventTypeCode: anEventType)
+		withBuffer: aBuffer
+		for: self

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/sendEvent.withSignedPoint..st

@@ -0,0 +1,7 @@
+-> to chrome
+sendEvent: anEventType withSignedPoint: aPoint
+
+	self sendEvent: anEventType withBuffer: ((ByteArray new: 8)
+		signedLongAt: 1 put: aPoint x asInteger;
+		signedLongAt: 5 put: aPoint y asInteger;
+		yourself)

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/tabId..st

@@ -0,0 +1,4 @@
+accessing
+tabId: anObject
+
+	tabId := anObject

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/tabId.st

@@ -0,0 +1,4 @@
+accessing
+tabId
+
+	^ tabId

packages/MagicMouse-Core.package/MMBrowserMorph.class/instance/updateImage..st

@@ -1,28 +1,8 @@
 <- from chrome
 updateImage: payload
 
-	| format png form |
-	format := payload unsignedCharAt: 2.
-	format = $r
-		ifTrue: [ | width height |
-			width := payload unsignedLongAt: 3.
-			height := payload unsignedLongAt: 7.
-			png := payload copyFrom: 11 to: payload size.
-			form := Form extent: width @ height depth: 32.
-			1 to: width * height - 1 do: [:index |
-				form bits
-					at: index
-					put: (png at: index * 4 + 3) asInteger << 0 + ((png at: index * 4 + 2) asInteger << 8) + ((png at: index * 4 + 1) asInteger << 16) + ((png at: index * 4 + 0) asInteger << 24)]]
-		ifFalse: [ | reader |
-			format caseOf: {
-				[$p] -> [
-					reader := PNGReadWriter on: (payload copyFrom: 3 to: payload size) readStream.
-					form := reader nextImage].
-				[$j] -> [
-					reader := MMFastJPEGReader on: (payload readStream
-						skip: 2;
-						yourself).
-					form := reader nextImage: self image]}].
+	| form |
+	form := self class parseImage: payload into: self image.
 	form extent > viewportSize ifTrue: ["We need to crop the incoming image if we don't run Chrome in headless mode
 		or if we just resized the window and Chrome still sends us a bigger image than now requested."
 	form := form contentsOfArea: (0 @ 0 extent: viewportSize)].