Skip to content

Commit 0e71eff

Browse files
committed
test pass for setting extension registry
1 parent cf62b36 commit 0e71eff

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

console/atest-desktop/index.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,16 @@
8585
window.setInterval(loadServerStatus, 2000)
8686

8787
const portInput = document.getElementById('port');
88+
portInput.addEventListener("input", function(e) {
89+
window.electronAPI.setPort(portInput.value)
90+
});
91+
8892
const extensionRegistry = document.getElementById('extension-registry');
93+
extensionRegistry.addEventListener("input", function(e) {
94+
console.log('setExtensionRegistry', extensionRegistry.value)
95+
window.electronAPI.setExtensionRegistry(extensionRegistry.value)
96+
});
97+
8998
(async function() {
9099
portInput.value = await window.electronAPI.getPort()
91100
extensionRegistry.value = await window.electronAPI.getExtensionRegistry()

console/atest-desktop/main.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ menu.append(new MenuItem({
117117
Menu.setApplicationMenu(menu)
118118

119119
let serverProcess;
120-
let serverPort;
121-
let setExtensionRegistry = "ghcr.io";
120+
let serverPort = 7788;
121+
let extensionRegistry = "ghcr.io";
122122

123123
// This method will be called when Electron has finished
124124
// initialization and is ready to create browser windows.
@@ -132,18 +132,20 @@ app.whenReady().then(() => {
132132
ipcMain.on('control', (e, okCallback, errCallback) => {
133133
server.control(okCallback, errCallback)
134134
})
135-
ipcMain.handle('setPort', (port) => {
136-
serverPort = port;
135+
ipcMain.handle('setPort', (e, port) => {
136+
console.log('setPort', port)
137+
serverPort = port;
137138
})
138-
ipcMain.handle('setExtensionRegistry', (registry) => {
139-
setExtensionRegistry = registry
139+
ipcMain.handle('setExtensionRegistry', (e, registry) => {
140+
console.log('setExtensionRegistry', registry)
141+
extensionRegistry = registry
140142
})
141143
ipcMain.handle('getExtensionRegistry', () => {
142-
return setExtensionRegistry
144+
return extensionRegistry
143145
})
144146
ipcMain.handle('getHomePage', server.getHomePage)
145147
ipcMain.handle('getPort', () => {
146-
return server.getPort()
148+
return serverPort
147149
})
148150
ipcMain.handle('getHealthzUrl', server.getHealthzUrl)
149151

@@ -191,9 +193,9 @@ const startServer = () => {
191193

192194
serverProcess = spawn(atestFromHome, [
193195
"server",
194-
"--http-port", server.getPort(),
196+
`--http-port=${serverPort}`,
195197
"--port=0",
196-
`--extension-registry=${setExtensionRegistry}`,
198+
`--extension-registry=${extensionRegistry}`,
197199
"--local-storage", path.join(homeData, "*.yaml")
198200
])
199201
serverProcess.stdout.on('data', (data) => {

console/atest-desktop/preload.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ contextBridge.exposeInMainWorld('electronAPI', {
3636
control: (okCallback, errCallback) => ipcRenderer.send('control', okCallback, errCallback),
3737
getHomePage: () => ipcRenderer.invoke('getHomePage'),
3838
getPort: () => ipcRenderer.invoke('getPort'),
39-
setPort: (port) => ipcRenderer.send('setPort', port),
40-
setExtensionRegistry: (registry) => ipcRenderer.send('setExtensionRegistry', registry),
39+
setPort: (port) => ipcRenderer.invoke('setPort', port),
40+
setExtensionRegistry: (registry) => ipcRenderer.invoke('setExtensionRegistry', registry),
4141
getExtensionRegistry: () => ipcRenderer.invoke('getExtensionRegistry'),
4242
getHealthzUrl: () => ipcRenderer.invoke('getHealthzUrl'),
4343
})

0 commit comments

Comments
 (0)