agl 43.1.0 → 43.2.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/changelog.md +12 -0
- package/dist_serve/bundle.js +5329 -5116
- package/dist_serve/bundle.js.map +2 -2
- package/dist_serve/bundle.js.third-party-notices.json +30 -30
- package/dist_serve/bundle.js.third-party-notices.txt +30 -30
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/aglapi/aglapisurface.document.js +325 -1
- package/dist_ts/aglapi/interfaces.d.ts +3 -0
- package/dist_ts/aglapi/interfaces.js +2 -1
- package/dist_ts/classes.authmodels.js +17 -4
- package/dist_ts/classes.authstore.js +16 -2
- package/dist_ts/classes.cli.d.ts +4 -2
- package/dist_ts/classes.cli.js +6 -3
- package/dist_ts/classes.controller.d.ts +10 -0
- package/dist_ts/classes.controller.js +119 -4
- package/dist_ts/classes.controllermanagement.d.ts +14 -4
- package/dist_ts/classes.controllermanagement.js +20 -2
- package/dist_ts/classes.gatewayclient.d.ts +115 -0
- package/dist_ts/classes.gatewayclient.js +336 -0
- package/dist_ts/classes.gatewayclientstore.d.ts +97 -0
- package/dist_ts/classes.gatewayclientstore.js +261 -0
- package/dist_ts/classes.inferencerouter.d.ts +9 -0
- package/dist_ts/classes.inferencerouter.js +11 -1
- package/dist_ts/classes.inferenceservice.d.ts +9 -0
- package/dist_ts/classes.inferenceservice.js +27 -1
- package/dist_ts/classes.mcpclient.d.ts +4 -1
- package/dist_ts/classes.mcpclient.js +19 -1
- package/dist_ts/classes.mcpcontrollerhost.d.ts +3 -1
- package/dist_ts/classes.mcpcontrollerhost.js +9 -1
- package/dist_ts/classes.mcptools.d.ts +3 -3
- package/dist_ts/classes.mcptools.js +26 -1
- package/dist_ts/classes.mcpvalidation.js +7 -1
- package/dist_ts/classes.proxycontrol.d.ts +11 -0
- package/dist_ts/classes.proxycontrol.js +7 -1
- package/dist_ts/classes.proxycontrolclient.d.ts +17 -0
- package/dist_ts/classes.proxycontrolclient.js +35 -1
- package/dist_ts/classes.proxydaemon.js +8 -1
- package/dist_ts/classes.proxymonitor.d.ts +7 -0
- package/dist_ts/classes.proxymonitor.js +13 -1
- package/dist_ts/classes.trustedproxysecrets.d.ts +2 -0
- package/dist_ts/classes.trustedproxysecrets.js +5 -1
- package/dist_ts/functions.controllermanagementsurface.d.ts +4 -0
- package/dist_ts/functions.controllermanagementsurface.js +15 -1
- package/dist_ts/functions.gatewaycli.d.ts +24 -0
- package/dist_ts/functions.gatewaycli.js +395 -0
- package/dist_ts/functions.gatewayroute.d.ts +135 -0
- package/dist_ts/functions.gatewayroute.js +366 -0
- package/dist_ts/functions.inferencecli.js +30 -1
- package/dist_ts/functions.inferencecliarguments.d.ts +8 -2
- package/dist_ts/functions.inferencecliarguments.js +31 -3
- package/dist_ts/functions.proxycapacity.d.ts +50 -0
- package/dist_ts/functions.proxycapacity.js +142 -0
- package/dist_ts/functions.proxycapacitycli.d.ts +30 -0
- package/dist_ts/functions.proxycapacitycli.js +65 -0
- package/dist_ts/functions.remotecli.d.ts +30 -3
- package/dist_ts/functions.remotecli.js +44 -18
- package/dist_ts/interfaces.auth.d.ts +25 -4
- package/dist_ts/interfaces.auth.js +7 -1
- package/dist_ts/plugins.d.ts +2 -0
- package/dist_ts/plugins.js +4 -1
- package/dist_ts_authswitch/authority-placement.js +3 -17
- package/dist_ts_authswitch/authority-usagelimit.d.ts +29 -0
- package/dist_ts_authswitch/authority-usagelimit.js +66 -2
- package/dist_ts_authswitch/authority-usagewindows.d.ts +6 -0
- package/dist_ts_authswitch/authority-usagewindows.js +15 -1
- package/dist_ts_interfaces/gateway.d.ts +151 -0
- package/dist_ts_interfaces/gateway.js +66 -0
- package/dist_ts_interfaces/index.d.ts +2 -0
- package/dist_ts_interfaces/index.js +3 -1
- package/dist_ts_interfaces/management.d.ts +4 -4
- package/dist_ts_interfaces/management.js +3 -2
- package/dist_ts_interfaces/mcprequests.d.ts +14 -2
- package/dist_ts_interfaces/mcprequests.js +2 -1
- package/dist_ts_interfaces/proxycapacity.d.ts +99 -0
- package/dist_ts_interfaces/proxycapacity.js +74 -0
- package/package.json +4 -3
- package/readme.md +79 -5
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/aglapi/aglapisurface.document.ts +324 -0
- package/ts/aglapi/interfaces.ts +1 -0
- package/ts/classes.authmodels.ts +22 -3
- package/ts/classes.authstore.ts +15 -1
- package/ts/classes.cli.ts +7 -3
- package/ts/classes.controller.ts +134 -3
- package/ts/classes.controllermanagement.ts +40 -7
- package/ts/classes.gatewayclient.ts +401 -0
- package/ts/classes.gatewayclientstore.ts +272 -0
- package/ts/classes.inferencerouter.ts +12 -0
- package/ts/classes.inferenceservice.ts +27 -0
- package/ts/classes.mcpclient.ts +18 -0
- package/ts/classes.mcpcontrollerhost.ts +13 -0
- package/ts/classes.mcptools.ts +30 -2
- package/ts/classes.mcpvalidation.ts +5 -0
- package/ts/classes.proxycontrol.ts +16 -0
- package/ts/classes.proxycontrolclient.ts +30 -0
- package/ts/classes.proxydaemon.ts +8 -0
- package/ts/classes.proxymonitor.ts +12 -0
- package/ts/classes.trustedproxysecrets.ts +5 -0
- package/ts/functions.controllermanagementsurface.ts +15 -0
- package/ts/functions.gatewaycli.ts +436 -0
- package/ts/functions.gatewayroute.ts +429 -0
- package/ts/functions.inferencecli.ts +24 -0
- package/ts/functions.inferencecliarguments.ts +30 -4
- package/ts/functions.proxycapacity.ts +191 -0
- package/ts/functions.proxycapacitycli.ts +104 -0
- package/ts/functions.remotecli.ts +56 -20
- package/ts/interfaces.auth.ts +28 -4
- package/ts/plugins.ts +5 -0
- package/ts_authswitch/authority-placement.ts +2 -15
- package/ts_authswitch/authority-usagelimit.ts +84 -1
- package/ts_authswitch/authority-usagewindows.ts +13 -0
- package/ts_interfaces/gateway.ts +242 -0
- package/ts_interfaces/index.ts +2 -0
- package/ts_interfaces/management.ts +6 -4
- package/ts_interfaces/mcprequests.ts +18 -0
- package/ts_interfaces/proxycapacity.ts +162 -0
- package/ts_web/00_commitinfo_data.ts +1 -1
- package/ts_web/classes.browserpresentation.ts +13 -5
- package/ts_web/elements.accounts.ts +40 -113
- package/ts_web/elements.configurationpane.ts +24 -37
- package/ts_web/elements.devices.ts +4 -17
- package/ts_web/elements.flexlimitstrip.ts +21 -70
- package/ts_web/elements.harnesscontrollerapp.ts +91 -185
|
@@ -2,6 +2,7 @@ import type { IAglProxyStatus, IReq_AglProxyUsage, TAglProxyLeaseCatalog } from
|
|
|
2
2
|
import { type TInferenceCredential, type TInferenceProvider, type TProxyCredentialDelivery } from './functions.proxycontract.js';
|
|
3
3
|
import type { IConfigurationInferenceProxy } from './configuration/classes.inferencereview.js';
|
|
4
4
|
import type { IControllerProxyUnit, TControllerProxyState } from '../dist_ts_interfaces/index.js';
|
|
5
|
+
import { type IProxyCapacityAnswer, type IProxyCapacityRequest } from '../dist_ts_interfaces/proxycapacity.js';
|
|
5
6
|
export interface IAglProxyMonitorOptions {
|
|
6
7
|
/** The proxy's private control socket. */
|
|
7
8
|
socketPath: string;
|
|
@@ -80,6 +81,12 @@ export declare class AglProxyMonitor implements IConfigurationInferenceProxy {
|
|
|
80
81
|
enabled: boolean;
|
|
81
82
|
active: boolean;
|
|
82
83
|
} | undefined>;
|
|
84
|
+
/**
|
|
85
|
+
* A pool's room for new work as the proxy judges it (`agl.proxy.capacity`), read only by the contract. A proxy of an
|
|
86
|
+
* older release that does not know the request rejects with `AglProxyOutdatedError`, one that is not running with
|
|
87
|
+
* `AglProxyUnavailableError`.
|
|
88
|
+
*/
|
|
89
|
+
capacity(requestArg: IProxyCapacityRequest, signalArg: AbortSignal): Promise<IProxyCapacityAnswer>;
|
|
83
90
|
/** The token usage the proxy counted, as the metrics board's usage feed reads it. */
|
|
84
91
|
usage(requestArg: IReq_AglProxyUsage['request'], signalArg: AbortSignal): Promise<IReq_AglProxyUsage['response']>;
|
|
85
92
|
catalog(providerArg: TInferenceProvider, signalArg: AbortSignal, credentialArg?: TInferenceCredential, accountIdArg?: string): Promise<TAglProxyLeaseCatalog>;
|
|
@@ -5,6 +5,7 @@ import { AglProxyService } from './classes.proxyservice.js';
|
|
|
5
5
|
import { proxyCredentialFile } from './functions.proxycredentialfile.js';
|
|
6
6
|
import { verifyProxyCredentialHelper } from './functions.proxycredentialhelper.js';
|
|
7
7
|
import { aglProxyDefaultPort } from './functions.proxycontract.js';
|
|
8
|
+
import { isProxyCapacityAnswer } from '../dist_ts_interfaces/proxycapacity.js';
|
|
8
9
|
/** The credential launcher of this process's AGL home. */
|
|
9
10
|
const homeCredentialHelper = () => {
|
|
10
11
|
const paths = resolveAGLHomePaths();
|
|
@@ -123,6 +124,17 @@ export class AglProxyMonitor {
|
|
|
123
124
|
async unit() {
|
|
124
125
|
return (await this.unitState()) ?? undefined;
|
|
125
126
|
}
|
|
127
|
+
/**
|
|
128
|
+
* A pool's room for new work as the proxy judges it (`agl.proxy.capacity`), read only by the contract. A proxy of an
|
|
129
|
+
* older release that does not know the request rejects with `AglProxyOutdatedError`, one that is not running with
|
|
130
|
+
* `AglProxyUnavailableError`.
|
|
131
|
+
*/
|
|
132
|
+
async capacity(requestArg, signalArg) {
|
|
133
|
+
const answer = await this.client.capacity(requestArg, signalArg, commitinfo.version);
|
|
134
|
+
if (!isProxyCapacityAnswer(answer))
|
|
135
|
+
throw new Error('The AGL proxy answered a capacity this AGL cannot read.');
|
|
136
|
+
return answer;
|
|
137
|
+
}
|
|
126
138
|
/** The token usage the proxy counted, as the metrics board's usage feed reads it. */
|
|
127
139
|
usage(requestArg, signalArg) {
|
|
128
140
|
return this.client.usage(requestArg, signalArg);
|
|
@@ -145,4 +157,4 @@ export class AglProxyMonitor {
|
|
|
145
157
|
throw new Error(`The AGL proxy answered delivery ${issued.delivery}, not ${deliveryArg}.`);
|
|
146
158
|
}
|
|
147
159
|
}
|
|
148
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
160
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5wcm94eW1vbml0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9jbGFzc2VzLnByb3h5bW9uaXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDckQsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFFM0QsT0FBTyxFQUFFLHFCQUFxQixFQUFFLHdCQUF3QixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbEcsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzVELE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ25GLE9BQU8sRUFBRSxtQkFBbUIsRUFDSyxNQUFNLDhCQUE4QixDQUFDO0FBR3RFLE9BQU8sRUFBRSxxQkFBcUIsRUFBeUQsTUFBTSxtQ0FBbUMsQ0FBQztBQXlCakksMERBQTBEO0FBQzFELE1BQU0sb0JBQW9CLEdBQUcsR0FBbUMsRUFBRTtJQUNoRSxNQUFNLEtBQUssR0FBRyxtQkFBbUIsRUFBRSxDQUFDO0lBQ3BDLE9BQU8sRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLHFCQUFxQixFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUM7QUFDakUsQ0FBQyxDQUFDO0FBVUYsMEhBQTBIO0FBQzFILE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBRyxDQUFDLFNBQXNDLEVBQXlCLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsU0FBUztJQUNuSCxDQUFDLENBQUMsU0FBUyxDQUFDLFNBQVMsS0FBSyxPQUFPLElBQUksU0FBUyxDQUFDLE9BQU8sS0FBSyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFD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
|
|
@@ -58,6 +58,8 @@ export declare class ControllerTrustedProxySecrets {
|
|
|
58
58
|
accepts(valueArg: string | null): boolean;
|
|
59
59
|
/** The secret the gateway's route must carry: the rotation's while one is in progress, else the active one. */
|
|
60
60
|
routeSecret(): IControllerTrustedProxyRouteSecret;
|
|
61
|
+
/** Whether a rotation waits for the route to carry its secret: the next secret is accepted beside the active one. */
|
|
62
|
+
rotating(): boolean;
|
|
61
63
|
/**
|
|
62
64
|
* Starts a rotation: a new secret, accepted beside the active one from now on, which the route must carry next.
|
|
63
65
|
* A rotation already in progress is returned again, so a sync that failed is retried with the same secret.
|
|
@@ -196,6 +196,10 @@ export class ControllerTrustedProxySecrets {
|
|
|
196
196
|
const secret = this.next ?? this.active;
|
|
197
197
|
return { secret: secret.text.toString('utf8'), generation: secret.generation };
|
|
198
198
|
}
|
|
199
|
+
/** Whether a rotation waits for the route to carry its secret: the next secret is accepted beside the active one. */
|
|
200
|
+
rotating() {
|
|
201
|
+
return !this.closed && this.next !== undefined;
|
|
202
|
+
}
|
|
199
203
|
/**
|
|
200
204
|
* Starts a rotation: a new secret, accepted beside the active one from now on, which the route must carry next.
|
|
201
205
|
* A rotation already in progress is returned again, so a sync that failed is retried with the same secret.
|
|
@@ -335,4 +339,4 @@ export const removeControllerTrustedProxySecret = async (controllerIdArg) => {
|
|
|
335
339
|
}
|
|
336
340
|
return true;
|
|
337
341
|
};
|
|
338
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.trustedproxysecrets.js","sourceRoot":"","sources":["../../ts/classes.trustedproxysecrets.ts"],"names":[],"mappings":"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"}
|
|
342
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.trustedproxysecrets.js","sourceRoot":"","sources":["../../ts/classes.trustedproxysecrets.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,8 @@ export interface IControllerManagementPeer {
|
|
|
9
9
|
headers: Headers;
|
|
10
10
|
state: Record<string, unknown>;
|
|
11
11
|
};
|
|
12
|
+
/** The request's loopback connection, from which a local CLI caller's process is proved (`agl remote gateway sync`). */
|
|
13
|
+
connection?: plugins.smartserve.IConnectionInfo;
|
|
12
14
|
}
|
|
13
15
|
export declare const isLoopbackPeerAddress: (addressArg: string | undefined) => boolean;
|
|
14
16
|
/**
|
|
@@ -27,6 +29,8 @@ export declare const admitControllerManagementTypedRequest: (requestArg: plugins
|
|
|
27
29
|
peer: IControllerManagementPeer;
|
|
28
30
|
};
|
|
29
31
|
} | Response;
|
|
32
|
+
/** The loopback connection a management request's peer carries, or `undefined` when it carries none. */
|
|
33
|
+
export declare const readManagementPeerConnection: (localDataArg: unknown) => plugins.smartserve.IConnectionInfo | undefined;
|
|
30
34
|
/**
|
|
31
35
|
* The management endpoint as a surface of the controller's listener: it matches only the exact host and path, so
|
|
32
36
|
* every other request on the port keeps reaching the browser surface.
|
|
@@ -77,10 +77,24 @@ export const admitControllerManagementTypedRequest = (requestArg, contextArg) =>
|
|
|
77
77
|
peer: {
|
|
78
78
|
id: `management:${plugins.crypto.randomUUID()}`,
|
|
79
79
|
context: { headers: contextArg.headers, state: {} },
|
|
80
|
+
...(contextArg.connectionInfo === undefined ? {} : { connection: { ...contextArg.connectionInfo } }),
|
|
80
81
|
},
|
|
81
82
|
},
|
|
82
83
|
};
|
|
83
84
|
};
|
|
85
|
+
/** The loopback connection a management request's peer carries, or `undefined` when it carries none. */
|
|
86
|
+
export const readManagementPeerConnection = (localDataArg) => {
|
|
87
|
+
const peer = typeof localDataArg === 'object' && localDataArg !== null
|
|
88
|
+
? localDataArg.peer : undefined;
|
|
89
|
+
const connection = typeof peer === 'object' && peer !== null ? peer.connection : undefined;
|
|
90
|
+
if (typeof connection !== 'object' || connection === null)
|
|
91
|
+
return undefined;
|
|
92
|
+
const { remoteAddr, remotePort, localAddr, localPort, encrypted } = connection;
|
|
93
|
+
if (typeof remoteAddr !== 'string' || typeof localAddr !== 'string' || typeof encrypted !== 'boolean'
|
|
94
|
+
|| !Number.isSafeInteger(remotePort) || !Number.isSafeInteger(localPort))
|
|
95
|
+
return undefined;
|
|
96
|
+
return { remoteAddr, remotePort: remotePort, localAddr, localPort: localPort, encrypted };
|
|
97
|
+
};
|
|
84
98
|
/**
|
|
85
99
|
* The management endpoint as a surface of the controller's listener: it matches only the exact host and path, so
|
|
86
100
|
* every other request on the port keeps reaching the browser surface.
|
|
@@ -107,4 +121,4 @@ export const createControllerManagementSurface = (optionsArg) => ({
|
|
|
107
121
|
crossOriginResourcePolicy: 'same-origin',
|
|
108
122
|
},
|
|
109
123
|
});
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLmNvbnRyb2xsZXJtYW5hZ2VtZW50c3VyZmFjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2Z1bmN0aW9ucy5jb250cm9sbGVybWFuYWdlbWVudHN1cmZhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxjQUFjLENBQUM7QUFDeEMsT0FBTyxFQUNMLDJCQUEyQixFQUMzQiwyQ0FBMkMsRUFDM0Msb0NBQW9DLEdBQ3JDLE1BQU0sMkJBQTJCLENBQUM7QUFFbkMsMkdBQTJHO0FBQzNHLE1BQU0scUJBQXFCLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQyxXQUFXLEVBQUUsa0JBQWtCLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQztBQUVoRjs7O0dBR0c7QUFDSCxNQUFNLGlCQUFpQixHQUFHO0lBQ3hCLFdBQVc7SUFDWCxpQkFBaUI7SUFDakIsa0JBQWtCO0lBQ2xCLG1CQUFtQjtJQUNuQixXQUFXO0lBQ1gsbUNBQW1DO0NBQzNCLENBQUM7QUFFWCxNQUFNLFlBQVksR0FBRyxJQUFJLEdBQUcsQ0FBQyxDQUFDLFFBQVEsRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLGFBQWEsRUFBRSxtQkFBbUIsQ0FBQyxDQUFDLENBQUM7QUFnQnBHLE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHLENBQUMsVUFBOEIsRUFBVyxFQUFFLENBQUMsQ0FDaEYsVUFBVSxLQUFLLFNBQVMsSUFBSSxxQkFBcUIsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQ2xFLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sZ0NBQWdDLEdBQUcsQ0FDOUMsVUFBOEMsRUFDOUMsT0FBZSxFQUNFLEVBQUU7SUFDbkIsSUFBSSxDQUFDLHFCQUFxQixDQUFDLFVBQVUsQ0FBQyxjQUFjLEVBQUUsVUFBVSxDQUFDLEVBQUUsQ0FBQztRQUNsRSxPQUFPLElBQUksUUFBUSxDQUFDLFdBQVcsRUFB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
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { type IRemoteCliOptions } from './functions.remotecli.js';
|
|
2
|
+
import type { IControllerGatewayStatus } from '../dist_ts_interfaces/index.js';
|
|
3
|
+
export declare const gatewayCliHelp = "Usage: agl remote gateway enrol [--gateway-url URL] [--target-host HOST] [--port PORT] < ADMIN_TOKEN_FILE\n agl remote gateway status [--json] [--port PORT]\n agl remote gateway sync [--rotate] [--port PORT]\n agl remote gateway remove [--abandon] [--port PORT]\nThe controller on PORT (default 4097) keeps its own route on a dcrouter gateway, as a gateway client of type custom:\nhttps://HOST of its public origin, TLS ended at the gateway, forwarded with the trusted-proxy secret to HOST:PORT,\nreachable from private networks only (source profile LOCAL NETWORK, directly at the hub and over its VPN, never through\nRemoteIngress), with the gateway's own DNS record. The running controller syncs it in the background: at start, again\nafter six hours, and with backoff from 30 s to 15 min after a failure a later sync can fix. A gateway without\nroutes.requestHeaders (before dcrouter 34.5.0) gets no route and is waited for: asked again with that backoff, then\nevery six hours and at every sync. A failure only the operator can fix (a revoked or stale credential, a refused\nroute, a DNS conflict) stops the syncs until the next start or sync; status names it.\nenrol runs against a stopped controller behind its gateway (agl remote set first). It reads a gateway admin token\nfrom standard input, a pipe or a file, never a terminal, provisions the gateway client agl-<installation>-PORT with\nexactly this route and its own credential, and keeps that credential sealed with the TPM; the admin token is used\nonce and never stored or printed: revoke it afterwards. --gateway-url is the gateway's API base URL (requests go to\nURL/typedrequest): https, plain http only on loopback (127.0.0.0/8, ::1, localhost), for every request carries a\ncredential. --target-host is the address the gateway reaches this host by; both are required the first time and\nkept for the next. Run it again to finish an enrolment whose confirmation was lost (no token needed then), or to\nrenew the credential.\nstatus shows the enrolment and the last sync, from the running controller or, while it is stopped, from its\ndatabase. sync asks the running controller to sync now; --rotate first rotates the trusted-proxy secret, which the\nprevious secret stays valid for until a sync carried the new one to the route.\nremove runs against a stopped controller: it deletes the route and its DNS record on the gateway and forgets the\ncredential. --abandon forgets the enrolment without reaching the gateway and prints the route left behind, for a\ngateway admin to delete.\n";
|
|
4
|
+
export type TGatewayCliArguments = {
|
|
5
|
+
action: 'enrol';
|
|
6
|
+
port: number;
|
|
7
|
+
gatewayUrl?: string;
|
|
8
|
+
targetHost?: string;
|
|
9
|
+
} | {
|
|
10
|
+
action: 'status';
|
|
11
|
+
port: number;
|
|
12
|
+
json: boolean;
|
|
13
|
+
} | {
|
|
14
|
+
action: 'sync';
|
|
15
|
+
port: number;
|
|
16
|
+
rotate: boolean;
|
|
17
|
+
} | {
|
|
18
|
+
action: 'remove';
|
|
19
|
+
port: number;
|
|
20
|
+
abandon: boolean;
|
|
21
|
+
};
|
|
22
|
+
export declare const parseGatewayCliArguments: (argsArg: readonly string[]) => TGatewayCliArguments;
|
|
23
|
+
export declare const formatGatewayStatus: (portArg: number, runningArg: boolean, statusArg: IControllerGatewayStatus) => string;
|
|
24
|
+
export declare const runGatewayCli: (argsArg: string[], optionsArg?: IRemoteCliOptions) => Promise<void>;
|