@usine/server 0.4.1-next.312.g8cd2d1c → 0.4.1-next.316.g8cb790a
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/README.md +6 -4
- package/dist/auth/github.d.ts.map +1 -1
- package/dist/auth/github.js +12 -1
- package/dist/auth/github.js.map +1 -1
- package/dist/auth/local.d.ts.map +1 -1
- package/dist/auth/local.js +12 -7
- package/dist/auth/local.js.map +1 -1
- package/dist/auth/memory.d.ts.map +1 -1
- package/dist/auth/memory.js +19 -5
- package/dist/auth/memory.js.map +1 -1
- package/dist/auth/model.d.ts +1 -0
- package/dist/auth/model.d.ts.map +1 -1
- package/dist/auth/model.js +3 -0
- package/dist/auth/model.js.map +1 -1
- package/dist/auth/sqlite.d.ts.map +1 -1
- package/dist/auth/sqlite.js +23 -6
- package/dist/auth/sqlite.js.map +1 -1
- package/dist/http.d.ts.map +1 -1
- package/dist/http.js +1 -5
- package/dist/http.js.map +1 -1
- package/dist/instance/operator-api.d.ts +2 -2
- package/dist/instance/operator-api.d.ts.map +1 -1
- package/dist/instance/operator-api.js +5 -3
- package/dist/instance/operator-api.js.map +1 -1
- package/dist/restart.d.ts +1 -1
- package/dist/restart.d.ts.map +1 -1
- package/dist/restart.js +5 -3
- package/dist/restart.js.map +1 -1
- package/dist/status.d.ts +1 -1
- package/dist/status.d.ts.map +1 -1
- package/dist/stop.d.ts +4 -4
- package/dist/stop.d.ts.map +1 -1
- package/dist/stop.js +7 -4
- package/dist/stop.js.map +1 -1
- package/dist/up.d.ts.map +1 -1
- package/dist/up.js +13 -8
- package/dist/up.js.map +1 -1
- package/dist/upgrade/control.d.ts.map +1 -1
- package/dist/upgrade/control.js +4 -10
- package/dist/upgrade/control.js.map +1 -1
- package/dist/upgrade/upgrade.d.ts +1 -1
- package/dist/upgrade/upgrade.d.ts.map +1 -1
- package/dist/web/assets/_agent-DepVKL0x.js +1 -0
- package/dist/web/assets/_label-D1NDcNEd.js +1 -0
- package/dist/web/assets/{_loop-CsRBgGBH.js → _loop-CHirDXtw.js} +1 -1
- package/dist/web/assets/{_name-_Ri5OBXg.js → _name-Cjz4Eh5V.js} +1 -1
- package/dist/web/assets/{_number-DjPm2qoI.js → _number-BDGdGs40.js} +1 -1
- package/dist/web/assets/_number-CQA4h-if.js +1 -0
- package/dist/web/assets/_number-raMcX6Tx.js +1 -0
- package/dist/web/assets/_project-B1e2BXA3.js +2 -0
- package/dist/web/assets/{_project-a5ldbK8h.js → _project-BQFE2oyo.js} +1 -1
- package/dist/web/assets/_project-CQA4h-if.js +1 -0
- package/dist/web/assets/_run-CQA4h-if.js +1 -0
- package/dist/web/assets/{_run-7LNnUjcP.js → _run-DNaKP7w3.js} +2 -2
- package/dist/web/assets/{_worker-CBoXczuF.js → _worker-QVUcOKjx.js} +1 -1
- package/dist/web/assets/{action-CUtKF6cz.js → action-DNjx31s1.js} +1 -1
- package/dist/web/assets/{actions-CGSyN7cc.js → actions-aqiIBtS5.js} +1 -1
- package/dist/web/assets/{agents-Vz6-R-Ka.js → agents-AUlO5Pti.js} +1 -1
- package/dist/web/assets/agents-R31tkMMi.js +1 -0
- package/dist/web/assets/api-DwN3kSQQ.js +335 -0
- package/dist/web/assets/{code-block-Bi6j7xDQ.js → code-block-BI4SkDYE.js} +1 -1
- package/dist/web/assets/drawer-Dj8_eweE.js +1 -0
- package/dist/web/assets/{edit-and-retry-Vphni8UJ.js → edit-and-retry-Bm2ywGyb.js} +1 -1
- package/dist/web/assets/{file-error-Da5DiacI.js → file-error-Cn4FOeP5.js} +1 -1
- package/dist/web/assets/{history-sksM-eRT.js → history-B-5DIw_m.js} +1 -1
- package/dist/web/assets/{index-s2nPwRk7.js → index-DPIIZZQW.js} +5 -5
- package/dist/web/assets/{label-badge-Cnf1YK3o.js → label-badge-jGoXWA48.js} +1 -1
- package/dist/web/assets/{labels-CDtSqBG-.js → labels-D9D-Fb42.js} +1 -1
- package/dist/web/assets/{list-goJ8RHPN.js → list-i93NA9gx.js} +1 -1
- package/dist/web/assets/loops-J9Sjra50.js +1 -0
- package/dist/web/assets/{members-BSODXFhL.js → members-BGwanpYm.js} +1 -1
- package/dist/web/assets/{model-BNyVjWar.js → model-COUbyrgw.js} +1 -1
- package/dist/web/assets/{moves-BuOhBtpj.js → moves-BFFuQUE-.js} +1 -1
- package/dist/web/assets/{not-found-rG3Xb9vc.js → not-found-CdghaTA2.js} +1 -1
- package/dist/web/assets/{outcome-j60wLl2R.js → outcome-CmvNlUH9.js} +2 -2
- package/dist/web/assets/overview-CLJidsWL.js +1 -0
- package/dist/web/assets/{page-BWEsHzht.js → page-BxwHDG7d.js} +1 -1
- package/dist/web/assets/{projects-B5t0KMRN.js → projects-DpOkoWby.js} +1 -1
- package/dist/web/assets/{queries-C1SujlpL.js → queries-9CHQQCFo.js} +1 -1
- package/dist/web/assets/{queries-0ZyDsXTD.js → queries-BX9lUByL.js} +1 -1
- package/dist/web/assets/{queries-CRgQPqQj.js → queries-b3KpGnfR.js} +1 -1
- package/dist/web/assets/{queries-D-uofdf5.js → queries-cgEOpD01.js} +1 -1
- package/dist/web/assets/{repositories-B3i7ZzmV.js → repositories-yi4NP_JL.js} +1 -1
- package/dist/web/assets/{repository-link-C611-quq.js → repository-link-DkmW0MdW.js} +1 -1
- package/dist/web/assets/route-B8O_RTyH.js +1 -0
- package/dist/web/assets/route-CzqWsCoM.js +1 -0
- package/dist/web/assets/{route-status-B-jofGgl.js → route-status-DgvskV7L.js} +1 -1
- package/dist/web/assets/routes-CQA4h-if.js +1 -0
- package/dist/web/assets/{routes-BcmHZHbD.js → routes-CkbAkTGB.js} +1 -1
- package/dist/web/assets/{run-again-B7QmklEQ.js → run-again-C22ZHT3m.js} +1 -1
- package/dist/web/assets/{section-t8XbBLHM.js → section-CEYfkhpJ.js} +1 -1
- package/dist/web/assets/{section-BUBxP2Wi.js → section-D4vtTY68.js} +1 -1
- package/dist/web/assets/{section-C8IBNoJA.js → section-FvrnVD-4.js} +1 -1
- package/dist/web/assets/{settings-B8XUfgUq.js → settings-CQQsYzCh.js} +1 -1
- package/dist/web/assets/{sign-in-BmrnOxtZ.js → sign-in-Cgy6mhon.js} +1 -1
- package/dist/web/assets/{strings-DusJwajC.js → strings-CbPdXAbx.js} +1 -1
- package/dist/web/assets/{tasks-M7pLiNq6.js → tasks-BEeYY3hT.js} +1 -1
- package/dist/web/assets/tasks-CQA4h-if.js +1 -0
- package/dist/web/assets/{tokens-DVStD47s.js → tokens-xB41CrH3.js} +1 -1
- package/dist/web/assets/{usage-C9w51z2s.js → usage-euC4O9Ry.js} +1 -1
- package/dist/web/assets/{use-project-links-YQDjqdhN.js → use-project-links-C_eP8rWp.js} +1 -1
- package/dist/web/assets/{useTriggerFocusGuards-BjDsGd09.js → useTriggerFocusGuards-C9lW5Ddm.js} +1 -1
- package/dist/web/assets/{workers-u5rmt50I.js → workers-CIaPcH4_.js} +1 -1
- package/dist/web/index.html +12 -12
- package/package.json +9 -9
- package/dist/web/assets/_agent-BalSUpo8.js +0 -1
- package/dist/web/assets/_label-CKa_5ZwI.js +0 -1
- package/dist/web/assets/_number-BtXSlhke.js +0 -1
- package/dist/web/assets/_number-CRC8azRH.js +0 -1
- package/dist/web/assets/_project-BtXSlhke.js +0 -1
- package/dist/web/assets/_project-DRugT2zE.js +0 -2
- package/dist/web/assets/_run-BtXSlhke.js +0 -1
- package/dist/web/assets/agents-CeaKq-VZ.js +0 -1
- package/dist/web/assets/api-DKkXYbSU.js +0 -335
- package/dist/web/assets/drawer-sEzbtXSu.js +0 -1
- package/dist/web/assets/loops-BHrQssBM.js +0 -1
- package/dist/web/assets/overview-Cp6rRu05.js +0 -1
- package/dist/web/assets/route-DlZz6URL.js +0 -1
- package/dist/web/assets/route-M1J8FzeG.js +0 -1
- package/dist/web/assets/routes-BtXSlhke.js +0 -1
- package/dist/web/assets/tasks-BtXSlhke.js +0 -1
package/README.md
CHANGED
|
@@ -135,6 +135,8 @@ After the first poll cycle and schedule check finish, refreshing the overview re
|
|
|
135
135
|
|
|
136
136
|
A global npm installation managed by systemd checks for upgrades every five minutes. Run `usine config edit settings instance` to configure `settings.upgrade_channel: latest` or `next` and `settings.upgrade_mode: off`, `propose`, or `automatic`. The defaults are `latest` and `propose`. Before offering an upgrade or draining attempts, the server checks that every `@usine/*` dependency, including transitive dependencies, resolves on the registry. If a package is unavailable, the server keeps admitting attempts and checks again in the next cycle.
|
|
137
137
|
|
|
138
|
+
Upgrade status retains the last fully verified version for the selected channel while a check is running or a newer release is incomplete. Registry probe details stay in the server log; the status message reports upgrade failures.
|
|
139
|
+
|
|
138
140
|
In **Configuration → Settings**, select **Upgrade when idle** to stop admitting attempts and wait for active attempts to finish, or **Upgrade now** to restart and reattach running attempts. `usine upgrade [<version> | --channel <latest|next>]` requests the same operation; `--force` selects immediate restart, and `--check` only reports versions. The CLI prints when the request is accepted; Settings and the helper journal report its outcome.
|
|
139
141
|
|
|
140
142
|
Install the helper service and polkit rule in the [server guide](https://docs.usine.dev/guides/run-the-orchestrator-on-a-server/) before using app upgrades. The independent helper installs into the same npm prefix and restores the previous version if installation or the new operator API fails. Its result is in `.usine/upgrade/result.json`; inspect `journalctl -u usine-upgrade.service` for progress. For npm `ETARGET` or `E404` errors, the helper tries installation up to three times, 60 seconds apart. After a successful rollback from an install failure, automatic mode can retry that version. A version that failed its health check, or whose rollback record does not identify the failure stage, requires a manual retry. Rollback restores packages; maintain database backups for releases with incompatible storage changes.
|
|
@@ -159,9 +161,9 @@ Operator API requests require an instance token or a browser session, including
|
|
|
159
161
|
|
|
160
162
|
`GET /api/version` is an upgrade health endpoint that returns only the running release string. It remains public so helpers copied by releases before member authentication can verify the new server during a managed upgrade. Upgrade status and upgrade requests require authentication.
|
|
161
163
|
|
|
162
|
-
|
|
164
|
+
When `usine up` writes to a terminal, open the printed **Sign in** URL. The link expires after 10 minutes and works once. For a detached instance, a system service, or a new link, run `usine sign-in-link` in the instance folder. This also works before GitHub user authorization is configured. Keep these URLs private.
|
|
163
165
|
|
|
164
|
-
`usine up` writes `.usine/admin-token` with mode `0600` and replaces it on each start. Local status and lifecycle commands
|
|
166
|
+
`usine up` writes `.usine/admin-token` with mode `0600` and replaces it on each start. Local status and lifecycle commands require this file to be owned by the current user, have mode `0600`, and be a regular file rather than a symbolic link. An unreadable or unsafe file fails the command before stop or restart sends a signal. Configuration commands access the local database directly; access to the instance folder is required.
|
|
165
167
|
|
|
166
168
|
### GitHub App settings
|
|
167
169
|
|
|
@@ -180,9 +182,9 @@ Add members by GitHub login on **Members**. The last member cannot be removed. R
|
|
|
180
182
|
|
|
181
183
|
### Device tokens
|
|
182
184
|
|
|
183
|
-
Run `usine sign-in <instance-origin>`, open the GitHub device page, and enter the printed code. After authorization, the CLI prints an instance token once. Store it in a secret manager and send it as `Authorization: Bearer <token>`. The instance stores only its hash. GitHub user
|
|
185
|
+
Run `usine sign-in <instance-origin>`, open the GitHub device page, and enter the printed code. After authorization, the CLI prints an instance token once. Store it in a secret manager and send it as `Authorization: Bearer <token>`. The instance stores only its hash. After reading identity, usine requests revocation of the GitHub user token and wipes its local copy. A failed revocation logs a warning and preserves the sign-in result.
|
|
184
186
|
|
|
185
|
-
**Tokens** lists the signed-in member's browsers and devices, creation times, and last use. Revoke an entry to end access. Device tokens remain valid until revoked; browser sessions expire after 30 days. **Sign out** revokes the current browser session.
|
|
187
|
+
**Tokens** lists the signed-in member's browsers and devices, creation times, and last use, updated at most once a minute per token. Listing tokens deletes expired credentials and excludes them from the response. Revoke an entry to end access. Device tokens remain valid until revoked; browser sessions expire after 30 days. **Sign out** revokes the current browser session.
|
|
186
188
|
|
|
187
189
|
Browser sessions use an `HttpOnly`, `SameSite=Strict` cookie, with `Secure` except for local HTTP origins. Browser writes require `X-Usine-CSRF`. The bundled UI reads its CSRF cookie and sends that header. Health and sign-in endpoints are public; the separate GitHub webhook listener verifies delivery signatures. Sign-in initiation, link issuance, GitHub exchanges, and invalid challenges have separate instance-wide limits of 60 requests per operation per minute. Invalid challenges do not consume the limits for valid sign-ins. Device polls also honor GitHub's interval.
|
|
188
190
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../src/auth/github.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAU,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClF,OAAO,EAAE,UAAU,EAAyC,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,SAAS,EAAe,cAAc,EAAE,MAAM,YAAY,CAAC;AAGpE,QAAA,MAAM,UAAU;;;;;;EAMd,CAAC;;wBAQqB,OAAO;2BACJ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;kBAC9E,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC;qBACzE,MAAM,CAAC,MAAM,CAAC,OAAO,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC;mBAClD,CACb,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,KAC5B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC;qBAC3C,CAAC,KAAK,EAAE,aAAa,KAAK,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC;;AAVvF,qBAAa,YAAa,SAAQ,iBAYD;CAAG;AAEpC,eAAO,MAAM,iBAAiB,
|
|
1
|
+
{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../src/auth/github.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAU,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClF,OAAO,EAAE,UAAU,EAAyC,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,SAAS,EAAe,cAAc,EAAE,MAAM,YAAY,CAAC;AAGpE,QAAA,MAAM,UAAU;;;;;;EAMd,CAAC;;wBAQqB,OAAO;2BACJ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;kBAC9E,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC;qBACzE,MAAM,CAAC,MAAM,CAAC,OAAO,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC;mBAClD,CACb,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,KAC5B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC;qBAC3C,CAAC,KAAK,EAAE,aAAa,KAAK,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC;;AAVvF,qBAAa,YAAa,SAAQ,iBAYD;CAAG;AAEpC,eAAO,MAAM,iBAAiB,6DAmI7B,CAAC"}
|
package/dist/auth/github.js
CHANGED
|
@@ -30,7 +30,18 @@ export const githubSignInLayer = Layer.effect(GitHubSignIn, Effect.gen(function*
|
|
|
30
30
|
const request = (req, schema) => client
|
|
31
31
|
.execute(req.pipe(HttpClientRequest.setHeaders({ accept: "application/json", "user-agent": "usine" })))
|
|
32
32
|
.pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(schema)), Effect.timeout("15 seconds"), Effect.mapError(() => authFailure("GitHub authorization failed. Try signing in again.", 502)));
|
|
33
|
-
const
|
|
33
|
+
const revoke = Effect.fn("GitHubSignIn.revoke")(function* (token) {
|
|
34
|
+
const { id, secret } = yield* credentials;
|
|
35
|
+
yield* Effect.annotateCurrentSpan({ clientId: id });
|
|
36
|
+
yield* client
|
|
37
|
+
.execute(HttpClientRequest.delete(`https://api.github.com/applications/${encodeURIComponent(id)}/token`).pipe(HttpClientRequest.basicAuth(id, secret), HttpClientRequest.setHeaders({
|
|
38
|
+
accept: "application/vnd.github+json",
|
|
39
|
+
"user-agent": "usine",
|
|
40
|
+
}), HttpClientRequest.bodyJsonUnsafe({ access_token: Redacted.value(token) })))
|
|
41
|
+
.pipe(Effect.timeout("15 seconds"));
|
|
42
|
+
yield* Effect.logDebug("GitHub user token revoked", { clientId: id });
|
|
43
|
+
});
|
|
44
|
+
const identity = (token) => request(HttpClientRequest.get("https://api.github.com/user").pipe(HttpClientRequest.bearerToken(token)), GitHubIdentity).pipe(Effect.ensuring(revoke(token).pipe(Effect.interruptible, Effect.catch((error) => Effect.logWarning("Could not revoke the GitHub user token", { reason: error._tag })), Effect.ensuring(Effect.sync(() => Redacted.wipeUnsafe(token))))));
|
|
34
45
|
const exchange = (fields) => request(HttpClientRequest.post("https://github.com/login/oauth/access_token").pipe(HttpClientRequest.bodyUrlParams(fields)), Schema.Union([AccessToken, OAuthFailure]));
|
|
35
46
|
return GitHubSignIn.of({
|
|
36
47
|
available: Option.isSome(config.clientId) && Option.isSome(config.clientSecret),
|
package/dist/auth/github.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../src/auth/github.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"github.js","sourceRoot":"","sources":["../../src/auth/github.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/local.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local.d.ts","sourceRoot":"","sources":["../../src/auth/local.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"local.d.ts","sourceRoot":"","sources":["../../src/auth/local.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAU,QAAQ,EAAU,MAAM,QAAQ,CAAC;AAMtE,eAAO,MAAM,cAAc,4KA4BzB,CAAC;AACH,eAAO,MAAM,eAAe,4KAY1B,CAAC"}
|
package/dist/auth/local.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { InstanceDirectory } from "@usine/core/instance";
|
|
2
|
-
import { Effect, FileSystem, Redacted, Schema } from "effect";
|
|
2
|
+
import { Effect, FileSystem, Option, Redacted, Schema } from "effect";
|
|
3
3
|
import { authFailure } from "./model.js";
|
|
4
4
|
import { randomSecret } from "./crypto.js";
|
|
5
5
|
const file = (directory) => `${directory}/.usine/admin-token`;
|
|
@@ -7,15 +7,20 @@ const Secret = Schema.String.check(Schema.isPattern(/^[A-Za-z0-9_-]{43}$/u));
|
|
|
7
7
|
export const readAdminToken = Effect.fn("Authentication.readAdminToken")(function* (directory) {
|
|
8
8
|
const fs = yield* FileSystem.FileSystem;
|
|
9
9
|
const path = file(directory);
|
|
10
|
+
const owner = process.getuid?.();
|
|
11
|
+
const failure = (reason) => authFailure(`${reason}: ${path}. Expected a regular file owned by uid ${owner ?? "of the current user"} with mode 0600, without a symbolic link.`, 503);
|
|
12
|
+
yield* Effect.annotateCurrentSpan({ path });
|
|
10
13
|
const info = yield* fs
|
|
11
|
-
.
|
|
12
|
-
.pipe(Effect.mapError(() =>
|
|
13
|
-
if (info.type !== "File" ||
|
|
14
|
-
|
|
14
|
+
.lstat(path)
|
|
15
|
+
.pipe(Effect.mapError(() => failure("Could not inspect the local admin token")));
|
|
16
|
+
if (info.type !== "File" ||
|
|
17
|
+
(info.mode & 0o7777) !== 0o600 ||
|
|
18
|
+
!Option.exists(info.uid, (uid) => uid === owner))
|
|
19
|
+
return yield* failure("Unsafe local admin token");
|
|
15
20
|
const raw = yield* fs
|
|
16
21
|
.readFileString(path)
|
|
17
|
-
.pipe(Effect.mapError(() =>
|
|
18
|
-
const token = yield* Schema.decodeUnknownEffect(Secret)(raw.trim()).pipe(Effect.mapError(() =>
|
|
22
|
+
.pipe(Effect.mapError(() => failure("Could not read the local admin token")));
|
|
23
|
+
const token = yield* Schema.decodeUnknownEffect(Secret)(raw.trim()).pipe(Effect.mapError(() => failure("Invalid local admin token; restart usine up")));
|
|
19
24
|
return Redacted.make(token);
|
|
20
25
|
});
|
|
21
26
|
export const writeAdminToken = Effect.fn("Authentication.writeAdminToken")(function* (directory) {
|
package/dist/auth/local.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../src/auth/local.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../src/auth/local.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../src/auth/memory.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../src/auth/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAAU,MAAM,QAAQ,CAAC;AAQtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,eAAO,MAAM,eAAe,sCAmF1B,CAAC"}
|
package/dist/auth/memory.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Effect, Layer, Option } from "effect";
|
|
2
|
-
import { authFailure,
|
|
1
|
+
import { Clock, Effect, Layer, Option } from "effect";
|
|
2
|
+
import { authFailure, Member, } from "./model.js";
|
|
3
3
|
import { AuthStore } from "./store.js";
|
|
4
4
|
export const memoryAuthLayer = Layer.sync(AuthStore, () => {
|
|
5
5
|
const members = new Map();
|
|
@@ -51,11 +51,25 @@ export const memoryAuthLayer = Layer.sync(AuthStore, () => {
|
|
|
51
51
|
const member = members.get(token.memberId);
|
|
52
52
|
if (member === undefined)
|
|
53
53
|
return Option.none();
|
|
54
|
-
const used =
|
|
55
|
-
|
|
54
|
+
const used = token.recordUse(now);
|
|
55
|
+
if (used !== token)
|
|
56
|
+
tokens.set(token.id, used);
|
|
56
57
|
return Option.some({ member, token: used });
|
|
57
58
|
})),
|
|
58
|
-
tokens: Effect.fn("AuthStore.tokens")((id)
|
|
59
|
+
tokens: Effect.fn("AuthStore.tokens")(function* (id) {
|
|
60
|
+
yield* Effect.annotateCurrentSpan({ memberId: id });
|
|
61
|
+
const now = yield* Clock.currentTimeMillis;
|
|
62
|
+
let expired = 0;
|
|
63
|
+
for (const [key, token] of tokens) {
|
|
64
|
+
if (token.expiresAt <= now) {
|
|
65
|
+
tokens.delete(key);
|
|
66
|
+
expired++;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (expired > 0)
|
|
70
|
+
yield* Effect.logInfo("Expired instance tokens deleted", { count: expired });
|
|
71
|
+
return [...tokens.values()].filter((token) => token.memberId === id);
|
|
72
|
+
}),
|
|
59
73
|
revoke: Effect.fn("AuthStore.revoke")(function* (member, id) {
|
|
60
74
|
if (tokens.get(id)?.memberId === member)
|
|
61
75
|
tokens.delete(id);
|
package/dist/auth/memory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/auth/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/auth/memory.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/model.d.ts
CHANGED
|
@@ -32,6 +32,7 @@ declare const InstanceToken_base: Schema.Class<InstanceToken, Schema.Struct<{
|
|
|
32
32
|
readonly kind: Schema.Literals<readonly ["session", "device"]>;
|
|
33
33
|
}>, {}>;
|
|
34
34
|
export declare class InstanceToken extends InstanceToken_base {
|
|
35
|
+
recordUse(now: number): InstanceToken;
|
|
35
36
|
}
|
|
36
37
|
declare const AuthError_base: Schema.Class<AuthError, Schema.TaggedStruct<"AuthError", {
|
|
37
38
|
readonly status: Schema.Literals<readonly [400, 401, 403, 409, 429, 500, 502, 503]>;
|
package/dist/auth/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/auth/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,eAAO,MAAM,YAAY,0CAExB,CAAC;AACF,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAC;;;;;AACpD,qBAAa,cAAe,SAAQ,mBAGlC;CAAG;;;;;;;AACL,qBAAa,MAAO,SAAQ,WAI1B;CAAG;AACL,eAAO,MAAM,OAAO,gDAAsD,CAAC;AAC3E,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAC;AAC1C,eAAO,MAAM,SAAS,0CAErB,CAAC;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,IAAI,CAAC;AAC9C,eAAO,MAAM,SAAS,0CAErB,CAAC;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,IAAI,CAAC;;;;;;;;;;;AAC9C,qBAAa,aAAc,SAAQ,kBASjC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/auth/model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,eAAO,MAAM,YAAY,0CAExB,CAAC;AACF,MAAM,MAAM,YAAY,GAAG,OAAO,YAAY,CAAC,IAAI,CAAC;;;;;AACpD,qBAAa,cAAe,SAAQ,mBAGlC;CAAG;;;;;;;AACL,qBAAa,MAAO,SAAQ,WAI1B;CAAG;AACL,eAAO,MAAM,OAAO,gDAAsD,CAAC;AAC3E,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAC;AAC1C,eAAO,MAAM,SAAS,0CAErB,CAAC;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,IAAI,CAAC;AAC9C,eAAO,MAAM,SAAS,0CAErB,CAAC;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,IAAI,CAAC;;;;;;;;;;;AAC9C,qBAAa,aAAc,SAAQ,kBASjC;IACA,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAEpC;CACF;;;;;AACD,qBAAa,SAAU,SAAQ,cAG7B;CAAG;AACL,eAAO,MAAM,WAAW,YAAa,MAAM,WAAU,SAAS,CAAC,QAAQ,CAAC,cACpC,CAAC"}
|
package/dist/auth/model.js
CHANGED
|
@@ -25,6 +25,9 @@ export class InstanceToken extends Schema.Class("InstanceToken")({
|
|
|
25
25
|
expiresAt: Schema.Number,
|
|
26
26
|
kind: Schema.Literals(["session", "device"]),
|
|
27
27
|
}) {
|
|
28
|
+
recordUse(now) {
|
|
29
|
+
return now - this.lastUsedAt < 60_000 ? this : new InstanceToken({ ...this, lastUsedAt: now });
|
|
30
|
+
}
|
|
28
31
|
}
|
|
29
32
|
export class AuthError extends Schema.TaggedError("AuthError")("AuthError", {
|
|
30
33
|
status: Schema.Literals([400, 401, 403, 409, 429, 500, 502, 503]),
|
package/dist/auth/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/auth/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACxE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAC7B,CAAC;AAEF,MAAM,OAAO,cAAe,SAAQ,MAAM,CAAC,KAAK,CAAiB,gBAAgB,CAAC,CAAC;IACjF,KAAK,EAAE,aAAa;IACpB,EAAE,EAAE,YAAY;CACjB,CAAC;CAAG;AACL,MAAM,OAAO,MAAO,SAAQ,MAAM,CAAC,KAAK,CAAS,QAAQ,CAAC,CAAC;IACzD,GAAG,cAAc,CAAC,MAAM;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,OAAO,EAAE,aAAa;CACvB,CAAC;CAAG;AACL,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CACpF,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAC/F,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAC1B,CAAC;AAEF,MAAM,OAAO,aAAc,SAAQ,MAAM,CAAC,KAAK,CAAgB,eAAe,CAAC,CAAC;IAC9E,EAAE,EAAE,OAAO;IACX,QAAQ,EAAE,YAAY;IACtB,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,SAAS;IACf,SAAS,EAAE,MAAM,CAAC,MAAM;IACxB,UAAU,EAAE,MAAM,CAAC,MAAM;IACzB,SAAS,EAAE,MAAM,CAAC,MAAM;IACxB,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;CAC7C,CAAC;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/auth/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACxE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAC7B,CAAC;AAEF,MAAM,OAAO,cAAe,SAAQ,MAAM,CAAC,KAAK,CAAiB,gBAAgB,CAAC,CAAC;IACjF,KAAK,EAAE,aAAa;IACpB,EAAE,EAAE,YAAY;CACjB,CAAC;CAAG;AACL,MAAM,OAAO,MAAO,SAAQ,MAAM,CAAC,KAAK,CAAS,QAAQ,CAAC,CAAC;IACzD,GAAG,cAAc,CAAC,MAAM;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,OAAO,EAAE,aAAa;CACvB,CAAC;CAAG;AACL,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CACpF,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAC1B,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAC/F,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAC1B,CAAC;AAEF,MAAM,OAAO,aAAc,SAAQ,MAAM,CAAC,KAAK,CAAgB,eAAe,CAAC,CAAC;IAC9E,EAAE,EAAE,OAAO;IACX,QAAQ,EAAE,YAAY;IACtB,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,SAAS;IACf,SAAS,EAAE,MAAM,CAAC,MAAM;IACxB,UAAU,EAAE,MAAM,CAAC,MAAM;IACzB,SAAS,EAAE,MAAM,CAAC,MAAM;IACxB,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;CAC7C,CAAC;IACA,SAAS,CAAC,GAAW;QACnB,OAAO,GAAG,GAAG,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;IACjG,CAAC;CACF;AACD,MAAM,OAAO,SAAU,SAAQ,MAAM,CAAC,WAAW,CAAY,WAAW,CAAC,CAAC,WAAW,EAAE;IACrF,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACjE,OAAO,EAAE,MAAM,CAAC,MAAM;CACvB,CAAC;CAAG;AACL,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,MAAM,GAAwB,GAAG,EAAE,EAAE,CAChF,IAAI,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../src/auth/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../src/auth/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,SAAS,EAAsC,MAAM,YAAY,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAYvC,eAAO,MAAM,eAAe,wDA+J3B,CAAC"}
|
package/dist/auth/sqlite.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Effect, Layer, Option, Schema } from "effect";
|
|
1
|
+
import { Clock, Effect, Layer, Option, Schema } from "effect";
|
|
2
2
|
import { SqlClient } from "effect/sql";
|
|
3
3
|
import { make as makeMigrator, fromRecord } from "effect/sql/Migrator";
|
|
4
4
|
import { AuthError, authFailure, InstanceToken, Member } from "./model.js";
|
|
@@ -75,12 +75,29 @@ export const sqliteAuthLayer = Layer.effect(AuthStore, Effect.gen(function* () {
|
|
|
75
75
|
const member = (yield* decodeRows(MemberJson, memberRows))[0];
|
|
76
76
|
if (member === undefined)
|
|
77
77
|
return Option.none();
|
|
78
|
-
|
|
78
|
+
yield* Effect.annotateCurrentSpan({ memberId: member.id, tokenId: token.id });
|
|
79
|
+
const used = token.recordUse(now);
|
|
80
|
+
if (used === token) {
|
|
81
|
+
yield* Effect.logDebug("Instance token last use unchanged", { tokenId: token.id });
|
|
82
|
+
return Option.some({ member, token });
|
|
83
|
+
}
|
|
79
84
|
const value = yield* Schema.encodeEffect(TokenJson)(used);
|
|
80
|
-
yield* sql `UPDATE usine_instance_tokens SET value = ${value} WHERE id = ${token.id}`;
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
85
|
+
const updated = yield* sql `UPDATE usine_instance_tokens SET value = ${value} WHERE id = ${token.id} AND json_extract(value, '$.lastUsedAt') = ${token.lastUsedAt} RETURNING id`;
|
|
86
|
+
yield* Effect.logDebug("Instance token last use recorded", {
|
|
87
|
+
memberId: member.id,
|
|
88
|
+
tokenId: token.id,
|
|
89
|
+
updated: updated.length > 0,
|
|
90
|
+
});
|
|
91
|
+
return Option.some({ member, token: updated.length > 0 ? used : token });
|
|
92
|
+
}).pipe(Effect.catch(failure("authenticate")))),
|
|
93
|
+
tokens: Effect.fn("AuthStore.tokens")((id) => Effect.gen(function* () {
|
|
94
|
+
yield* Effect.annotateCurrentSpan({ memberId: id });
|
|
95
|
+
const now = yield* Clock.currentTimeMillis;
|
|
96
|
+
const expired = yield* sql `DELETE FROM usine_instance_tokens WHERE expires_at <= ${now} RETURNING id`;
|
|
97
|
+
if (expired.length > 0)
|
|
98
|
+
yield* Effect.logInfo("Expired instance tokens deleted", { count: expired.length });
|
|
99
|
+
return yield* sql `SELECT value FROM usine_instance_tokens WHERE member_id = ${id} AND expires_at > ${now}`.pipe(Effect.flatMap((rows) => decodeRows(TokenJson, rows)));
|
|
100
|
+
}).pipe(Effect.catch(failure("list tokens")))),
|
|
84
101
|
revoke: Effect.fn("AuthStore.revoke")((member, id) => sql `DELETE FROM usine_instance_tokens WHERE id = ${id} AND member_id = ${member}`.pipe(Effect.andThen(Effect.logInfo("Instance token revoked", { memberId: member, tokenId: id })), Effect.catch(failure("revoke token")))),
|
|
85
102
|
});
|
|
86
103
|
}));
|
package/dist/auth/sqlite.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite.js","sourceRoot":"","sources":["../../src/auth/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"sqlite.js","sourceRoot":"","sources":["../../src/auth/sqlite.ts"],"names":[],"mappings":"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"}
|
package/dist/http.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAExE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,OAAO,EAAqB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKzE,OAAO,EAAE,KAAK,mBAAmB,EAAa,MAAM,8BAA8B,CAAC;AAMnF,OAAO,EAAU,KAAK,EAAE,MAAM,EAAsB,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAW,UAAU,EAAyC,MAAM,aAAa,CAAC;AAEzF,OAAO,EAAE,cAAc,EAAqB,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,KAAK,IAAI,EAAe,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAExE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,OAAO,EAAqB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKzE,OAAO,EAAE,KAAK,mBAAmB,EAAa,MAAM,8BAA8B,CAAC;AAMnF,OAAO,EAAU,KAAK,EAAE,MAAM,EAAsB,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAW,UAAU,EAAyC,MAAM,aAAa,CAAC;AAEzF,OAAO,EAAE,cAAc,EAAqB,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,KAAK,IAAI,EAAe,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AA2UjE;;;GAGG;AACH,eAAO,MAAM,SAAS,WAAY,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,sGAKtD,CAAC;AAEJ,eAAO,MAAM,YAAY,YAAa,MAAM,mNA6C3C,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,YACb,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,WAC3B,MAAM,QACT,IAAI,UACF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,QACzB,YAAY,aAEd,KAAK,CAAC,KAAK,CAAC,cAAc,GAAG,mBAAmB,GAAG,SAAS,GAAG,aAAa,CAAC,GAC7E,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,aACZ,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAC,gFAY3D,CAAC"}
|
package/dist/http.js
CHANGED
|
@@ -45,15 +45,11 @@ const operatorFailure = (error) => {
|
|
|
45
45
|
case "LoopNotFoundError":
|
|
46
46
|
return error.message;
|
|
47
47
|
case "BoardProjectNotFoundError":
|
|
48
|
-
return `Project "${error.repository}" was not found.`;
|
|
49
48
|
case "BoardItemNotFoundError":
|
|
50
|
-
return `Item ${error.repository}#${error.item} was not found on the board.`;
|
|
51
49
|
case "BoardLaneNotFoundError":
|
|
52
|
-
|
|
50
|
+
case "BoardLaneReadOnlyError":
|
|
53
51
|
case "GitHubItemNotFoundError":
|
|
54
52
|
return error.message;
|
|
55
|
-
case "BoardLaneReadOnlyError":
|
|
56
|
-
return `Lane "${error.lane}" is read-only. To move items, configure label-backed lanes in usine.yaml.`;
|
|
57
53
|
case "InstallationDiscoveryError":
|
|
58
54
|
case "AppPermissionError":
|
|
59
55
|
return error.message;
|
package/dist/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAqB,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,EAAE,iBAAiB,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACvF,OAAO,EAAqB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAA4B,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAc,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAqB,MAAM,cAAc,CAAC;AACjE,OAAO,EAAa,WAAW,EAAiB,MAAM,UAAU,CAAC;AAEjE,MAAM,eAAe,GAAG,CAAC,KAAmB,EAAE,EAAE;IAC9C,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE;QACpB,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,kBAAkB;gBACrB,OAAO,OAAO,KAAK,CAAC,KAAK,iBAAiB,CAAC;YAC7C,KAAK,2BAA2B;gBAC9B,IAAI,KAAK,CAAC,SAAS,KAAK,gBAAgB;oBACtC,OAAO,oFAAoF,CAAC;gBAC9F,IAAI,KAAK,CAAC,SAAS,KAAK,UAAU;oBAChC,OAAO,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,mDAAmD,CAAC;gBAC/G,OAAO,UAAU,KAAK,CAAC,SAAS,QAAQ,KAAK,CAAC,KAAK,gBAAgB,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC;YAClG,KAAK,+BAA+B;gBAClC,OAAO,oBAAoB,KAAK,CAAC,KAAK,qBAAqB,CAAC;YAC9D,KAAK,gCAAgC;gBACnC,OAAO,WAAW,KAAK,CAAC,SAAS,2BAA2B,KAAK,CAAC,KAAK,GAAG,CAAC;YAC7E,KAAK,+BAA+B;gBAClC,uFAAuF;gBACvF,IAAI,KAAK,CAAC,OAAO,KAAK,CAAC;oBACrB,OAAO,8CAA8C,KAAK,CAAC,MAAM,wDAAwD,CAAC;gBAC5H,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,cAAc,6BAA6B,KAAK,CAAC,MAAM,0CAA0C,CAAC;YACpK,KAAK,yBAAyB,CAAC;YAC/B,KAAK,sBAAsB,CAAC;YAC5B,KAAK,8BAA8B,CAAC;YACpC,KAAK,0BAA0B,CAAC;YAChC,KAAK,mBAAmB;gBACtB,OAAO,KAAK,CAAC,OAAO,CAAC;YACvB,KAAK,2BAA2B;gBAC9B,OAAO,YAAY,KAAK,CAAC,UAAU,kBAAkB,CAAC;YACxD,KAAK,wBAAwB;gBAC3B,OAAO,QAAQ,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,IAAI,8BAA8B,CAAC;YAC9E,KAAK,wBAAwB;gBAC3B,OAAO,SAAS,KAAK,CAAC,IAAI,+BAA+B,CAAC;YAC5D,KAAK,yBAAyB;gBAC5B,OAAO,KAAK,CAAC,OAAO,CAAC;YACvB,KAAK,wBAAwB;gBAC3B,OAAO,SAAS,KAAK,CAAC,IAAI,4EAA4E,CAAC;YACzG,KAAK,4BAA4B,CAAC;YAClC,KAAK,oBAAoB;gBACvB,OAAO,KAAK,CAAC,OAAO,CAAC;YACvB,KAAK,gBAAgB,CAAC;YACtB,KAAK,4BAA4B;gBAC/B,OAAO,KAAK,CAAC,OAAO,CAAC;YACvB,KAAK,sBAAsB;gBACzB,OAAO,KAAK,CAAC,OAAO,CAAC;YACvB,KAAK,yBAAyB;gBAC5B,OAAO,wCAAwC,KAAK,CAAC,SAAS,GAAG,CAAC;YACpE,KAAK,wBAAwB;gBAC3B,OAAO,kCAAkC,KAAK,CAAC,SAAS,GAAG,CAAC;YAC9D,KAAK,0BAA0B;gBAC7B,OAAO,WAAW,KAAK,CAAC,SAAS,yBAAyB,CAAC;QAC/D,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IACL,OAAO,IAAI,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAC/D,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,CAAC,OAAkB,EAAE,UAA0B,EAAE,EAAE,CAClF,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAClD,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;IAC/B,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;IACvE,OAAO,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,KAAK,IAAI;QAC1C,CAAC,CAAC,MAAM,CAAC,IAAI;QACb,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,IAAI,iBAAiB,CAAC;YACpB,KAAK,EAAE,2BAA2B;YAClC,OAAO,EAAE,cAAc,UAAU,+BAA+B,OAAO,GAAG;SAC3E,CAAC,CACH,CAAC;AACR,CAAC,CAAC,CACH,CAAC;AAEJ,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;AAE3E;;;GAGG;AACH,MAAM,eAAe,GAAG,CACtB,OAA4C,EAC5C,IAA6B,EACpB,EAAE;IACX,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;IACtC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACvC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;QAC5B,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,IAA6B,EAAE,EAAE,CAC/C,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAC1D,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;IAC3D,IAAI,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;QACnC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,oDAAoD,EAAE;YAC7E,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM;YAC9B,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC;YAC3C,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,CAAC,IAAI,iBAAiB,CAAC;YAClC,KAAK,EAAE,uBAAuB;YAC9B,OAAO,EAAE,sCAAsC;SAChD,CAAC,CAAC;IACL,CAAC;IACD,+EAA+E;IAC/E,yCAAyC;IACzC,MAAM,OAAO,GACX,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;QACzB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,OAAO,CAAC,IAAI,CACV,MAAM,CAAC,cAAc,CACnB,iBAAiB,CAAC,iBAAiB,EACnC,OAAO,CAAC,MAAM,CAAC;YACb,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,kBAAkB,CAAC;SAC1E,CAAC,CACH,CACF,CAAC;IACR,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CACxB,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAA6D,EAAE;QAChF,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC;YAAE,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1E,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,CAAC;QACnF,OAAO,MAAM,CAAC,IAAI,CAChB,IAAI,iBAAiB,CAAC;YACpB,KAAK,EAAE,gBAAgB;gBACrB,CAAC,CAAC,eAAe;gBACjB,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS;oBACxB,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,aAAa;YACnB,OAAO,EAAE,gBAAgB;gBACvB,CAAC,CAAC,2CAA2C;gBAC7C,CAAC,CAAC,oBAAoB,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE;SAC9C,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC,CACH,CAAC;AAEJ,MAAM,WAAW,GAAG,CAAO,MAAiC,EAAE,EAAE,CAC9D,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAW,CAAC,CAAC;AAE3C,MAAM,WAAW,GAAG,CAClB,GAA2E,EAC3E,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC;AAEhF,MAAM,iBAAiB,GAAG,CAAC,MAA+D,EAAE,EAAE,CAC5F,MAAM,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CACrF,MAAM,CAAC,QAAQ,CACb,CAAC,KAAK,EAAE,EAAE,CACR,IAAI,iBAAiB,CAAC;IACpB,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,oBAAoB,KAAK,CAAC,OAAO,EAAE;CAC7C,CAAC,CACL,CACF,CAAC;AAEJ,MAAM,YAAY,GAAG,CACnB,GAA4E,EAC5E,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IAC7D,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;QACzB,OAAO,KAAK,CAAC,CAAC,IAAI,iBAAiB,CAAC;YAClC,KAAK,EAAE,cAAc;YACrB,OAAO,EAAE,wDAAwD;SAClE,CAAC,CAAC;IACL,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CACpC,MAAM,CAAC,QAAQ,CACb,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,iBAAiB,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CACpF,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEL,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE,CACxE,MAAM;KACH,MAAM,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;KAC1E,MAAM,CAAC,eAAe,EAAE,GAAG,EAAE,CAC5B,YAAY,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CACzF;KACA,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACxC,YAAY,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CACxE;KACA,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;KACpE,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAChC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC7C,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;IAC1B,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1E,OAAO,OAAO,KAAK,SAAS;QAC1B,CAAC,CAAC,MAAM,CAAC,IAAI,CACT,IAAI,iBAAiB,CAAC;YACpB,KAAK,EAAE,2BAA2B;YAClC,OAAO,EAAE,WAAW,MAAM,CAAC,OAAO,iBAAiB;SACpD,CAAC,CACH;QACH,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC,CAAC,CACH,CACF;KACA,MAAM,CAAC,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAC3C,wBAAwB,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAC7D,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CACtF,CACF;KACA,MAAM,CAAC,iBAAiB,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CACjD,wBAAwB,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAC/D,MAAM,CAAC,OAAO,CACZ,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CACtB,OAAO,CAAC,aAAa,CACnB,IAAI,SAAS,CAAC;IACZ,UAAU,EAAE,OAAO,CAAC,UAAU;IAC9B,IAAI,EAAE,MAAM,CAAC,IAAI;IACjB,MAAM,EAAE,OAAO,CAAC,MAAM;CACvB,CAAC,CACH,CACF,CACF,EACD,WAAW,CACZ,CACF;KACA,MAAM,CAAC,kBAAkB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACzC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CACtB,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CACjE,CAAC,IAAI,CAAC,WAAW,CAAC,CACpB;KACA,MAAM,CAAC,oBAAoB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAC3C,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CACtB,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CACnE,CAAC,IAAI,CAAC,WAAW,CAAC,CACpB;KACA,MAAM,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;KAChE,MAAM,CAAC,cAAc,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAC9C,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CACxF;KACA,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAC1C,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAClE;KACA,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAC3C,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CACrF;KACA,MAAM,CAAC,aAAa,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACrC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CACzE;KACA,MAAM,CAAC,iBAAiB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACzC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAC7E;KACA,MAAM,CAAC,kBAAkB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAC1C,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CACpF;KACA,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CACtC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAC9D;KACA,MAAM,CAAC,eAAe,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACtC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAC9D;KACA,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAChC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAC1E;KACA,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAChD,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CACpF,WAAW,CACZ,CACF;KACA,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAC9B,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CACxE;KACA,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAC/B,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CACzE;KACA,MAAM,CAAC,kBAAkB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACzC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CACpF;KACA,MAAM,CACL,eAAe,EACf,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;IACxD,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACpD,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3F,OAAO,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CACpC,OAAO,CAAC,aAAa,CACnB,IAAI,SAAS,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CACzE,CACF,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACtB,CAAC,CAAC,CACH;KACA,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAC9B,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CACvE;KACA,MAAM,CAAC,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAChC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CACzE;KACA,MAAM,CACL,MAAM,EACN,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE;IAC1C,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACpD,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACrE,OAAO,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAChF,CAAC,CAAC,CACH;KACA,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;KAC9F,MAAM,CAAC,aAAa,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACrC,iBAAiB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAC3D;KACA,MAAM,CAAC,2BAA2B,EAAE,GAAG,EAAE,CACxC,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAC3D;KACA,MAAM,CAAC,2BAA2B,EAAE,GAAG,EAAE,CAAC,yBAAyB,EAAE,CAAC;KACtE,MAAM,CAAC,qBAAqB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;KACrF,MAAM,CAAC,wBAAwB,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAC9C,iBAAiB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAClD;KACA,MAAM,CAAC,uBAAuB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAC9C,yBAAyB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CACtE;KACA,MAAM,CAAC,qBAAqB,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAC5C,iBAAiB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CACrD;KACA,MAAM,CAAC,4BAA4B,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAC5D,yBAAyB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CACvE;KACA,MAAM,CAAC,2BAA2B,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAC3D,yBAAyB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CACtE;KACA,MAAM,CAAC,6BAA6B,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAC7D,yBAAyB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAC7E;KACA,MAAM,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;KAC9E,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAC5D,MAAM,CAAC,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;KAC/F,MAAM,CAAC,eAAe,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CACrC,WAAW,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAC9D,CACJ,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAA+B,EAAE,EAAE,CAC3D,cAAc,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CACpC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EACvB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAC7B,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAChD,CAAC;AAEJ,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE;IAC9C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IACjF,OAAO,UAAU,CAAC,MAAM,CAAC;QACvB,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,gBAAgB,CAAC;QAC9C,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC,OAAO,EAAE,EAAE,CAC/C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,CAAC;YACvF,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC;gBAC7C,OAAO,kBAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAC/D,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAC/C,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CACrB,MAAM,CAAC,QAAQ,CAAC,kCAAkC,EAAE;gBAClD,KAAK;gBACL,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;aACvB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAC1E,CACF,CAAC;QACJ,CAAC,CAAC,CACH;QACD,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,CACvC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,CAAC;YACvF,MAAM,iBAAiB,GACrB,QAAQ,KAAK,WAAW;gBACxB,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;gBACjC,QAAQ,KAAK,MAAM;gBACnB,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC5B,QAAQ,KAAK,SAAS;gBACtB,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAClC,MAAM,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAClD,IAAI,iBAAiB,IAAI,gBAAgB,EAAE,CAAC;gBAC1C,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,6DAA6D,EAAE;oBACpF,QAAQ;oBACR,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,gBAAgB;iBACpE,CAAC,CAAC;gBACH,OAAO,kBAAkB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YAC/D,CAAC;YACD,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,kDAAkD,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;YACzF,OAAO,KAAK,CAAC,CAAC,gBAAgB,CAAC;QACjC,CAAC,CAAC,CACH;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,OAAoC,EACpC,OAAe,EACf,IAAU,EACV,MAA+B,EAC/B,IAAkB,EAClB,QAAQ,GAEiB,KAAK,CAAC,KAAK,EACpC,QAAQ,GAAqD,KAAK,CAAC,KAAK,EACxE,EAAE;IACF,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAC3B,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAChE,YAAY,CAAC,OAAO,CAAC,EACrB,aAAa,CAAC,MAAM,EACpB,QAAQ,CACT,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IAClE,OAAO,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAClC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAC/E,CAAC;AACJ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../src/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,12 +16,12 @@ declare const OperatorApiError_base: Schema.Class<OperatorApiError, Schema.Tagge
|
|
|
16
16
|
export declare class OperatorApiError extends OperatorApiError_base {
|
|
17
17
|
}
|
|
18
18
|
/** Lists the Runs of the instance that listens on `port`, with one `GET /api/overview`. */
|
|
19
|
-
export declare const listRuns: (port: number & import("effect/Brand").Brand<"ServerPort">, directory?: (string & import("effect/Brand").Brand<"InstanceDirectory">) | undefined) => Effect.Effect<ListedRun[], OperatorApiError, import("effect/FileSystem").FileSystem | HttpClient.HttpClient>;
|
|
19
|
+
export declare const listRuns: (port: number & import("effect/Brand").Brand<"ServerPort">, directory?: (string & import("effect/Brand").Brand<"InstanceDirectory">) | undefined) => Effect.Effect<ListedRun[], import("../auth/model.ts").AuthError | OperatorApiError, import("effect/FileSystem").FileSystem | HttpClient.HttpClient>;
|
|
20
20
|
/**
|
|
21
21
|
* Returns the environment variables with the gateways' admin tokens, which `usine up` reads at
|
|
22
22
|
* startup, from `GET /api/configuration`.
|
|
23
23
|
*/
|
|
24
|
-
export declare const gatewayTokenVariables: (port: number & import("effect/Brand").Brand<"ServerPort">, directory?: (string & import("effect/Brand").Brand<"InstanceDirectory">) | undefined) => Effect.Effect<string[], OperatorApiError, import("effect/FileSystem").FileSystem | HttpClient.HttpClient>;
|
|
24
|
+
export declare const gatewayTokenVariables: (port: number & import("effect/Brand").Brand<"ServerPort">, directory?: (string & import("effect/Brand").Brand<"InstanceDirectory">) | undefined) => Effect.Effect<string[], import("../auth/model.ts").AuthError | OperatorApiError, import("effect/FileSystem").FileSystem | HttpClient.HttpClient>;
|
|
25
25
|
/** Returns whether an HTTP server answers on `port`, with any status. */
|
|
26
26
|
export declare const answers: (port: Port) => Effect.Effect<boolean, never, HttpClient.HttpClient>;
|
|
27
27
|
/** Whether the Run has a live Attempt. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operator-api.d.ts","sourceRoot":"","sources":["../../src/instance/operator-api.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,UAAU,EAAsB,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,KAAK,IAAI,EAAe,MAAM,WAAW,CAAC;;;;;AAOnD,6CAA6C;AAC7C,qBAAa,SAAU,SAAQ,cAG7B;CAAG;;;;;AAcL,sFAAsF;AACtF,qBAAa,gBAAiB,SAAQ,qBAE8B;CAAG;
|
|
1
|
+
{"version":3,"file":"operator-api.d.ts","sourceRoot":"","sources":["../../src/instance/operator-api.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAY,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,UAAU,EAAsB,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,KAAK,IAAI,EAAe,MAAM,WAAW,CAAC;;;;;AAOnD,6CAA6C;AAC7C,qBAAa,SAAU,SAAQ,cAG7B;CAAG;;;;;AAcL,sFAAsF;AACtF,qBAAa,gBAAiB,SAAQ,qBAE8B;CAAG;AA0BvE,2FAA2F;AAC3F,eAAO,MAAM,QAAQ,0SAMnB,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,qBAAqB,uSAMhC,CAAC;AAEH,yEAAyE;AACzE,eAAO,MAAM,OAAO,SAAU,IAAI,yDAM/B,CAAC;AAEJ,0CAA0C;AAC1C,eAAO,MAAM,cAAc,QAAS,SAAS,KAAG,OAAkC,CAAC"}
|
|
@@ -30,10 +30,12 @@ const getJson = (port, path, schema, directory) => {
|
|
|
30
30
|
return Effect.gen(function* () {
|
|
31
31
|
const token = yield* readAdminToken(directory);
|
|
32
32
|
const client = yield* HttpClient.HttpClient;
|
|
33
|
-
return yield* HttpClient.filterStatusOk(client)
|
|
33
|
+
return yield* HttpClient.filterStatusOk(client)
|
|
34
|
+
.get(url, {
|
|
34
35
|
headers: { authorization: `Bearer ${Redacted.value(token)}` },
|
|
35
|
-
})
|
|
36
|
-
|
|
36
|
+
})
|
|
37
|
+
.pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(schema)), Effect.timeout(OPERATOR_API_TIMEOUT), Effect.mapError((error) => new OperatorApiError({ url, reason: error.message })));
|
|
38
|
+
});
|
|
37
39
|
};
|
|
38
40
|
/** Lists the Runs of the instance that listens on `port`, with one `GET /api/overview`. */
|
|
39
41
|
export const listRuns = Effect.fn("Instance.listRuns")(function* (port, directory = InstanceDirectory.make(process.cwd())) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operator-api.js","sourceRoot":"","sources":["../../src/instance/operator-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAa,WAAW,EAAE,MAAM,WAAW,CAAC;AAEnD,MAAM,oBAAoB,GAAG,WAAW,CAAC;AAEzC,gGAAgG;AAChG,WAAW;AAEX,6CAA6C;AAC7C,MAAM,OAAO,SAAU,SAAQ,MAAM,CAAC,KAAK,CAAY,yBAAyB,CAAC,CAAC;IAChF,EAAE,EAAE,KAAK;IACT,KAAK,EAAE,MAAM,CAAC,MAAM;CACrB,CAAC;CAAG;AAEL,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;CACzE,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC,KAAK,CACnB,MAAM,CAAC,MAAM,CAAC;QACZ,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC;KAChF,CAAC,CACH;CACF,CAAC,CAAC;AAEH,sFAAsF;AACtF,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,CACtD,gCAAgC,CACjC,CAAC,kBAAkB,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG;AAEvE,MAAM,MAAM,GAAG,CAAC,IAAU,EAAE,IAAY,EAAE,EAAE,CAAC,UAAU,WAAW,IAAI,IAAI,GAAG,IAAI,EAAE,CAAC;AAEpF,MAAM,OAAO,GAAG,CACd,IAAU,EACV,IAAY,EACZ,MAA0B,EAC1B,SAA4B,EAC5B,EAAE;IACF,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;QAC5C,OAAO,KAAK,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"operator-api.js","sourceRoot":"","sources":["../../src/instance/operator-api.ts"],"names":[],"mappings":"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"}
|
package/dist/restart.d.ts
CHANGED
|
@@ -15,5 +15,5 @@ export declare const fallbackLaunch: (environment: CliEnvironment) => Effect.Eff
|
|
|
15
15
|
* the port on which that process answers, and pass if none does. Fails with `ListeningPortsError`,
|
|
16
16
|
* before any signal, if the OS can't list that process's ports.
|
|
17
17
|
*/
|
|
18
|
-
export declare const restart: (directory: string & import("effect/Brand").Brand<"InstanceDirectory">, options: LifecycleOptions, fallback: Effect.Effect<InstanceLaunch, CliUsageError, never>) => Effect.Effect<void, CliUsageError | import("./detach.ts").DetachedSpawnError | import("./detach.ts").DetachedStartError | import("./instance/lock.ts").InstanceLockError | InstanceNotRunningError | import("./stop.ts").KillTimeoutError | import("./instance/ports.ts").ListeningPortsError | import("./stop.ts").LiveAttemptsError | import("./stop.ts").MissingEnvironmentError | import("./instance/state.ts").SignalError | import("./stop.ts").StopTimeoutError | import("./instance/systemd.ts").SystemctlError | import("./detach.ts").SystemdStartError | UnrecordedInstanceError, import("effect/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/FileSystem").FileSystem | import("effect/http/HttpClient").HttpClient>;
|
|
18
|
+
export declare const restart: (directory: string & import("effect/Brand").Brand<"InstanceDirectory">, options: LifecycleOptions, fallback: Effect.Effect<InstanceLaunch, CliUsageError, never>) => Effect.Effect<void, import("./auth/model.ts").AuthError | CliUsageError | import("./detach.ts").DetachedSpawnError | import("./detach.ts").DetachedStartError | import("./instance/lock.ts").InstanceLockError | InstanceNotRunningError | import("./stop.ts").KillTimeoutError | import("./instance/ports.ts").ListeningPortsError | import("./stop.ts").LiveAttemptsError | import("./stop.ts").MissingEnvironmentError | import("./instance/state.ts").SignalError | import("./stop.ts").StopTimeoutError | import("./instance/systemd.ts").SystemctlError | import("./detach.ts").SystemdStartError | UnrecordedInstanceError, import("effect/process/ChildProcessSpawner").ChildProcessSpawner | import("effect/FileSystem").FileSystem | import("effect/http/HttpClient").HttpClient>;
|
|
19
19
|
//# sourceMappingURL=restart.d.ts.map
|
package/dist/restart.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart.d.ts","sourceRoot":"","sources":["../src/restart.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"restart.d.ts","sourceRoot":"","sources":["../src/restart.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,MAAM,EAAU,MAAM,QAAQ,CAAC;AACjD,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,gBAAgB,EAEtB,MAAM,UAAU,CAAC;AAIlB,OAAO,EACL,KAAK,cAAc,EAIpB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EAIxB,MAAM,WAAW,CAAC;AAEnB;;;GAGG;AACH,eAAO,MAAM,cAAc,gBAAiB,cAAc,wDACM,CAAC;AAgGjE;;;;;;;GAOG;AACH,eAAO,MAAM,OAAO,k6BAoBlB,CAAC"}
|
package/dist/restart.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { readAdminToken } from "./auth/local.js";
|
|
1
2
|
import { Console, Effect, Option } from "effect";
|
|
2
3
|
import { environmentUp, } from "./cli.js";
|
|
3
4
|
import { startAgain, startedMessage } from "./detach.js";
|
|
@@ -18,11 +19,11 @@ export const fallbackLaunch = (environment) => environmentUp(environment).pipe(E
|
|
|
18
19
|
*/
|
|
19
20
|
const operatorPort = Effect.fn("Cli.operatorPort")(function* (pid, directory) {
|
|
20
21
|
const ports = yield* listeningPorts(pid);
|
|
21
|
-
const port = yield* Effect.findFirst(ports, (port) => listRuns(port, directory).pipe(Effect.
|
|
22
|
+
const port = yield* Effect.findFirst(ports, (port) => listRuns(port, directory).pipe(Effect.as(true), Effect.catchTag("OperatorApiError", (error) => Effect.logDebug("A port of the instance process doesn't answer the operator API", {
|
|
22
23
|
pid,
|
|
23
24
|
port,
|
|
24
25
|
reason: error.reason,
|
|
25
|
-
})
|
|
26
|
+
}).pipe(Effect.as(false)))));
|
|
26
27
|
yield* Effect.annotateCurrentSpan({ pid, ports, port: Option.getOrUndefined(port) });
|
|
27
28
|
return port;
|
|
28
29
|
});
|
|
@@ -54,10 +55,11 @@ const restartTarget = Effect.fn("Cli.restartTarget")(function* (directory, fallb
|
|
|
54
55
|
yield* Effect.logInfo("Refusing to restart: a process holds the instance lock, but the pid file names no running process", { instanceDirectory: directory });
|
|
55
56
|
return yield* new UnrecordedInstanceError({ command: "restart", directory, pid: state.pid });
|
|
56
57
|
}
|
|
58
|
+
yield* readAdminToken(directory);
|
|
57
59
|
const pid = state.pid.value;
|
|
58
60
|
yield* Effect.annotateCurrentSpan({ pid });
|
|
59
61
|
const launch = yield* fallback;
|
|
60
|
-
const port = yield* operatorPort(pid, directory).pipe(Effect.
|
|
62
|
+
const port = yield* operatorPort(pid, directory).pipe(Effect.tapErrorTag("ListeningPortsError", (error) => Effect.logWarning("Refusing to restart: the ports of the instance process are unknown", {
|
|
61
63
|
pid,
|
|
62
64
|
reason: error.reason,
|
|
63
65
|
})));
|