querysub 0.361.0 → 0.362.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "querysub",
3
- "version": "0.361.0",
3
+ "version": "0.362.0",
4
4
  "main": "index.js",
5
5
  "license": "MIT",
6
6
  "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -119,7 +119,8 @@ export class ServiceDetailPage extends qreact.Component {
119
119
  if (!machineInfo) continue;
120
120
 
121
121
  let applyNodeId = machineInfo.applyNodeId;
122
- await MachineController(applyNodeId).killRollingServices.promise({
122
+ await MachineController(SocketFunction.browserNodeId()).killRollingServicesFromBrowser.promise({
123
+ machineNodeId: applyNodeId,
123
124
  serviceKey: config.parameters.key,
124
125
  });
125
126
  }
@@ -192,7 +193,8 @@ export class ServiceDetailPage extends qreact.Component {
192
193
  if (!machineInfo) continue;
193
194
 
194
195
  let applyNodeId = machineInfo.applyNodeId;
195
- let rollingInfo = MachineController(applyNodeId).getRollingServiceInfo({
196
+ let rollingInfo = MachineController(SocketFunction.browserNodeId()).getRollingServiceInfoFromBrowser({
197
+ machineNodeId: applyNodeId,
196
198
  serviceKey: config.parameters.key,
197
199
  });
198
200
  if (rollingInfo) {
@@ -146,12 +146,30 @@ class MachineControllerBase {
146
146
  return await getRollingServiceInfo(config);
147
147
  }
148
148
 
149
+ public async getRollingServiceInfoFromBrowser(config: {
150
+ machineNodeId: string;
151
+ serviceKey: string;
152
+ }): Promise<{ rollingScreenName: string; originalScreenName: string; expiresAt: number }[]> {
153
+ return await MachineController(config.machineNodeId).getRollingServiceInfo.promise({
154
+ serviceKey: config.serviceKey,
155
+ });
156
+ }
157
+
149
158
  public async killRollingServices(config: {
150
159
  serviceKey: string;
151
160
  }): Promise<void> {
152
161
  await killRollingServicesForService(config);
153
162
  }
154
163
 
164
+ public async killRollingServicesFromBrowser(config: {
165
+ machineNodeId: string;
166
+ serviceKey: string;
167
+ }): Promise<void> {
168
+ await MachineController(config.machineNodeId).killRollingServices.promise({
169
+ serviceKey: config.serviceKey,
170
+ });
171
+ }
172
+
155
173
  }
156
174
 
157
175
  let forwardedCallbacks = new Map<string, string>();
@@ -165,7 +183,9 @@ export const MachineController = getSyncedController(SocketFunction.register(
165
183
  deployMachineFromBrowser: {},
166
184
  deployMachine: {},
167
185
  getRollingServiceInfo: {},
186
+ getRollingServiceInfoFromBrowser: {},
168
187
  killRollingServices: {},
188
+ killRollingServicesFromBrowser: {},
169
189
  }),
170
190
  () => ({
171
191
  hooks: [assertIsManagementUser],
@@ -19,9 +19,13 @@ IMPORTANT! Now I am properly calling shutdown, so none of the streamed logs shou
19
19
 
20
20
 
21
21
 
22
- BUG: Fix it so we properly kill rolling screens when we disable a service
22
+ BUG: We aren't able to connect directly to the apply service? Hmm...
23
23
 
24
- TODO: Show rolling services somewhere
24
+ 0) Make a minor UI change, so we can see rolling nodes appear
25
+ 1) Disable, to ensure rolling nodes go away
26
+ 2) Re-enable
27
+ 3) Another minor UI change
28
+ 4) Use the new "kill rolling" so we can see a forced update
25
29
 
26
30
 
27
31
  BUG: Why are CYOA deploys not working!