Commitc19b39a

authored

chore: append bundle version to mach service name (#191)

We append the CFBundleVersion to the service name to ensure a new service is used for each version. This works around the issue described in#121, presumably caused by the XPC service cache not being invalidated on update.![image](https://github.com/user-attachments/assets/5b1f2d1d-7aa1-4f58-92b0-ecee712f9131)

1 parent6082e2d commitc19b39aCopy full SHA for c19b39a

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,12 @@`
`29`	`29`	`<key>NetworkExtension</key>`
`30`	`30`	`<dict>`
`31`	`31`	`<key>NEMachServiceName</key>`
`32`		`-<string>$(TeamIdentifierPrefix)com.coder.Coder-Desktop.VPN</string>`
	`32`	`+<!-- We append the CFBundleVersion to the service name to ensure a new`
	`33`	`+ service is used for each version. This works around the issue described`
	`34`	`+ in https://github.com/coder/coder-desktop-macos/issues/121, presumably`
	`35`	`+ caused by the XPC service cache not being invalidated on update.`
	`36`	`+-->`
	`37`	`+<string>$(TeamIdentifierPrefix)com.coder.Coder-Desktop.VPN.$(CURRENT_PROJECT_VERSION)</string>`
`33`	`38`	`</dict>`
`34`	`39`	`<key>SUPublicEDKey</key>`
`35`	`40`	`<string>Ae2oQLTcx89/a73XrpOt+IVvqdo+fMTjo3UKEm77VdA=</string>`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -183,15 +183,16 @@ class SystemExtensionDelegate<AsyncDelegate: SystemExtensionAsyncRecorder>:`
`183`	`183`	if existing.bundleVersion== `extension`.bundleVersion{
`184`	`184`	`return.replace`
`185`	`185`	`}`
	`186`	`+ // TODO: Workaround disabled, as we're trying another workaround`
`186`	`187`	`// To work around the bug described in`
`187`	`188`	`// https://github.com/coder/coder-desktop-macos/issues/121,`
`188`	`189`	`// we're going to manually reinstall after the replacement is done.`
`189`	`190`	// If we returned `.cancel` here the deactivation request will fail as
`190`	`191`	`// it looks for an extension with the current version string.`
`191`	`192`	`// There's no way to modify the deactivate request to use a different`
`192`	`193`	// version string (i.e. `existing.bundleVersion`).
`193`		`- logger.info("App upgrade detected, replacing and then reinstalling")`
`194`		`- action=.replacing`
	`194`	`+//logger.info("App upgrade detected, replacing and then reinstalling")`
	`195`	`+//action = .replacing`
`195`	`196`	`return.replace`
`196`	`197`	`}`
`197`	`198`	`}`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,12 @@`
`9`	`9`	`<key>NetworkExtension</key>`
`10`	`10`	`<dict>`
`11`	`11`	`<key>NEMachServiceName</key>`
`12`		`-<string>$(TeamIdentifierPrefix)com.coder.Coder-Desktop.VPN</string>`
	`12`	`+<!-- We append the CFBundleVersion to the service name to ensure a new`
	`13`	`+ service is used for each version. This works around the issue described`
	`14`	`+ in https://github.com/coder/coder-desktop-macos/issues/121, presumably`
	`15`	`+ caused by the XPC service cache not being invalidated on update.`
	`16`	`+-->`
	`17`	`+<string>$(TeamIdentifierPrefix)com.coder.Coder-Desktop.VPN.$(CURRENT_PROJECT_VERSION)</string>`
`13`	`18`	`<key>NEProviderClasses</key>`
`14`	`19`	`<dict>`
`15`	`20`	`<key>com.apple.networkextension.packet-tunnel</key>`

Comments

(0)