@goodandready/dsh-moa 0.2.62 → 0.2.63
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/lib/index.js +10 -12
- package/lib/services.js +1 -6
- package/package.json +1 -1
package/lib/index.js
CHANGED
|
@@ -133,38 +133,36 @@ export function apply(ctx, config) {
|
|
|
133
133
|
const liveCanvas = createLiveCanvasClient({ getPort: () => getWebServerPort(ctx) })
|
|
134
134
|
|
|
135
135
|
// Route: /dsh-moa/status & one-click updater
|
|
136
|
-
const registerWebSurfaces = (
|
|
137
|
-
if (!
|
|
138
|
-
const ws = service(
|
|
136
|
+
const registerWebSurfaces = (webCtx) => {
|
|
137
|
+
if (!webCtx) return
|
|
138
|
+
const ws = service(webCtx, 'webServer')
|
|
139
139
|
if (!ws || typeof ws.register !== 'function') return
|
|
140
140
|
|
|
141
|
-
const eff = typeof
|
|
141
|
+
const eff = typeof webCtx.effect === 'function' ? webCtx.effect : (typeof ctx.effect === 'function' ? ctx.effect : (fn) => fn())
|
|
142
142
|
eff(() => {
|
|
143
|
-
return registerPluginUpdater(
|
|
143
|
+
return registerPluginUpdater(webCtx, {
|
|
144
144
|
endpoint: '/api/dsh-moa/update',
|
|
145
145
|
packageName: '@goodandready/dsh-moa',
|
|
146
146
|
manifestUrl: new URL('../package.json', import.meta.url),
|
|
147
147
|
})
|
|
148
148
|
}, 'dsh-moa: plugin updater route')
|
|
149
149
|
|
|
150
|
-
registerMoaRoutes(
|
|
150
|
+
registerMoaRoutes(webCtx, {
|
|
151
151
|
live,
|
|
152
152
|
callLlm,
|
|
153
153
|
liveCanvas,
|
|
154
154
|
saveConfig,
|
|
155
155
|
Config,
|
|
156
156
|
plainConfig,
|
|
157
|
-
webServerPort: getWebServerPort(
|
|
158
|
-
timeMachineEngine: service(
|
|
157
|
+
webServerPort: getWebServerPort(webCtx) || getWebServerPort(ctx),
|
|
158
|
+
timeMachineEngine: service(webCtx, 'timeMachineEngine') || service(ctx, 'timeMachineEngine') || ctx.reflect?.get?.('timeMachineEngine', false),
|
|
159
159
|
})
|
|
160
160
|
}
|
|
161
161
|
|
|
162
|
-
if (service(ctx, 'webServer')) {
|
|
162
|
+
if (service(ctx, 'webServer')?.register) {
|
|
163
163
|
registerWebSurfaces(ctx)
|
|
164
164
|
} else if (typeof ctx.inject === 'function') {
|
|
165
|
-
ctx.inject(['webServer'],
|
|
166
|
-
registerWebSurfaces(webCtx)
|
|
167
|
-
})
|
|
165
|
+
ctx.inject(['webServer'], registerWebSurfaces)
|
|
168
166
|
}
|
|
169
167
|
|
|
170
168
|
// Session turn interceptor: route turn to real aggregator model & stream MoA synthesis
|
package/lib/services.js
CHANGED
|
@@ -16,12 +16,6 @@ export function service(ctx, name) {
|
|
|
16
16
|
} catch {
|
|
17
17
|
/* strict context refuses get() for a service the fiber does not inject */
|
|
18
18
|
}
|
|
19
|
-
try {
|
|
20
|
-
const viaReflect = ctx?.reflect?.get?.(name, false)
|
|
21
|
-
if (viaReflect) return viaReflect
|
|
22
|
-
} catch {
|
|
23
|
-
/* ignore reflection errors */
|
|
24
|
-
}
|
|
25
19
|
try {
|
|
26
20
|
return ctx ? ctx[name] : undefined
|
|
27
21
|
} catch {
|
|
@@ -38,3 +32,4 @@ export function getWebServerPort(ctx) {
|
|
|
38
32
|
const ws = service(ctx, 'webServer')
|
|
39
33
|
return (ws && typeof ws.port === 'number') ? ws.port : null
|
|
40
34
|
}
|
|
35
|
+
|