diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 93254231a..5e52294db 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -13,6 +13,9 @@ - - +**Clickup Task:** + + **How it works:** diff --git a/CHANGELOG.md b/CHANGELOG.md index 88096438b..ccd0d16ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ This is the changelog for Scramjet Transform Hub. It holds only notable commits, others are grouped without commit info. +## [0.34.4] - 2023-06-21 + +## ## Fixed + +* fix/proper-permissions-after-unpack by @tomekcrm in https://github.com/scramjetorg/transform-hub/pull/881 +* Add crash log feature to Kube Adapter by @MichalCz in https://github.com/scramjetorg/transform-hub/pull/792 +* si seq delete SEQ_ID --force by @patuwwy in https://github.com/scramjetorg/transform-hub/pull/884 +* Fix: Unable to set platform defaults by @piotrek6641 in https://github.com/scramjetorg/transform-hub/pull/883 +* Fix/prod only messages by @piotrek6641 in https://github.com/scramjetorg/transform-hub/pull/886 ## [0.34.3] and [0.34.2] - 2023-06-05 diff --git a/bdd/iac-test-data/sequences/infinite/package.json b/bdd/iac-test-data/sequences/infinite/package.json index 3a40edb83..c243b0b18 100644 --- a/bdd/iac-test-data/sequences/infinite/package.json +++ b/bdd/iac-test-data/sequences/infinite/package.json @@ -9,6 +9,6 @@ "build": "si pack -o ../hello-2.tar.gz ." }, "devDependencies": { - "@scramjet/types": "^0.34.3" + "@scramjet/types": "^0.34.4" } } diff --git a/bdd/package.json b/bdd/package.json index 84185fbd2..140e1e7f2 100644 --- a/bdd/package.json +++ b/bdd/package.json @@ -1,13 +1,13 @@ { "name": "scramjet-bdd", - "version": "0.34.3", + "version": "0.34.4", "description": "As the \"problem scope\" of the business problem that our technology solves is quite complex, we decided to use the BDD practice to support the development process. BDD is a methodology of high automation and agility. It describes a cycle of interactions with well-defined outcomes. As a result of these activities, we obtain working, tested software that has a real value.", "main": "_cucumber.js", "dependencies": { - "@scramjet/api-client": "^0.34.3", - "@scramjet/logger": "^0.34.3", - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/sth-config": "^0.34.3", + "@scramjet/api-client": "^0.34.4", + "@scramjet/logger": "^0.34.4", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/sth-config": "^0.34.4", "dockerode": "^3.3.4", "find-package-json": "^1.2.0", "freeport": "^1.0.5", @@ -17,7 +17,7 @@ "devDependencies": { "@cucumber/cucumber": "^7.3.2", "@cucumber/pretty-formatter": "^1.0.0", - "@scramjet/types": "^0.34.3" + "@scramjet/types": "^0.34.4" }, "scripts": { "build:bdd": "tsc -p tsconfig.json", diff --git a/docs/adapters/classes/KubernetesInstanceAdapter.md b/docs/adapters/classes/KubernetesInstanceAdapter.md index 921e384b9..65edac248 100644 --- a/docs/adapters/classes/KubernetesInstanceAdapter.md +++ b/docs/adapters/classes/KubernetesInstanceAdapter.md @@ -122,7 +122,7 @@ ILifeCycleAdapterMain.cleanup #### Defined in -[kubernetes-instance-adapter.ts:184](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/adapters/src/kubernetes-instance-adapter.ts#L184) +[kubernetes-instance-adapter.ts:182](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/adapters/src/kubernetes-instance-adapter.ts#L182) ___ @@ -140,7 +140,7 @@ ILifeCycleAdapterMain.getCrashLog #### Defined in -[kubernetes-instance-adapter.ts:209](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/adapters/src/kubernetes-instance-adapter.ts#L209) +[kubernetes-instance-adapter.ts:207](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/adapters/src/kubernetes-instance-adapter.ts#L207) ___ @@ -182,7 +182,7 @@ ILifeCycleAdapterRun.monitorRate #### Defined in -[kubernetes-instance-adapter.ts:189](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/adapters/src/kubernetes-instance-adapter.ts#L189) +[kubernetes-instance-adapter.ts:187](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/adapters/src/kubernetes-instance-adapter.ts#L187) ___ @@ -206,7 +206,7 @@ ILifeCycleAdapterMain.remove #### Defined in -[kubernetes-instance-adapter.ts:198](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/adapters/src/kubernetes-instance-adapter.ts#L198) +[kubernetes-instance-adapter.ts:196](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/adapters/src/kubernetes-instance-adapter.ts#L196) ___ @@ -276,7 +276,7 @@ ___ #### Defined in -[kubernetes-instance-adapter.ts:193](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/adapters/src/kubernetes-instance-adapter.ts#L193) +[kubernetes-instance-adapter.ts:191](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/adapters/src/kubernetes-instance-adapter.ts#L191) ## Constructors diff --git a/docs/api-client/classes/HostClient.md b/docs/api-client/classes/HostClient.md index b9ef4d629..cc23898b4 100644 --- a/docs/api-client/classes/HostClient.md +++ b/docs/api-client/classes/HostClient.md @@ -53,7 +53,7 @@ Provides methods to interact with Host. #### Defined in -[api-client/src/host-client.ts:13](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L13) +[api-client/src/host-client.ts:14](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L14) ___ @@ -63,7 +63,7 @@ ___ #### Defined in -[api-client/src/host-client.ts:11](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L11) +[api-client/src/host-client.ts:12](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L12) ## Accessors @@ -81,7 +81,7 @@ ClientProvider.client #### Defined in -[api-client/src/host-client.ts:15](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L15) +[api-client/src/host-client.ts:16](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L16) ## Constructors @@ -98,13 +98,13 @@ ClientProvider.client #### Defined in -[api-client/src/host-client.ts:19](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L19) +[api-client/src/host-client.ts:20](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L20) ## Methods ### deleteSequence -▸ **deleteSequence**(`sequenceId`): `Promise`<`DeleteSequenceResponse`\> +▸ **deleteSequence**(`sequenceId`, `opts?`): `Promise`<`DeleteSequenceResponse`\> Deletes Sequence with given id. @@ -112,7 +112,9 @@ Deletes Sequence with given id. | Name | Type | Description | | :------ | :------ | :------ | -| `sequenceId` | `string` | Sequence id | +| `sequenceId` | `string` | Sequence id. | +| `opts?` | `Object` | Additional sequence delete options. | +| `opts.force` | `boolean` | - | #### Returns @@ -122,7 +124,7 @@ Promise resolving to delete Sequence result. #### Defined in -[api-client/src/host-client.ts:108](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L108) +[api-client/src/host-client.ts:110](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L110) ___ @@ -146,7 +148,7 @@ Promise resolving to response with log stream. #### Defined in -[api-client/src/host-client.ts:58](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L58) +[api-client/src/host-client.ts:59](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L59) ___ @@ -164,7 +166,7 @@ Promise resolving to Host configuration (public part). #### Defined in -[api-client/src/host-client.ts:153](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L153) +[api-client/src/host-client.ts:159](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L159) ___ @@ -188,7 +190,7 @@ InstanceClient instance. #### Defined in -[api-client/src/host-client.ts:199](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L199) +[api-client/src/host-client.ts:205](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L205) ___ @@ -212,7 +214,7 @@ Promise resolving to Instance details. #### Defined in -[api-client/src/host-client.ts:119](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L119) +[api-client/src/host-client.ts:125](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L125) ___ @@ -230,7 +232,7 @@ Promise resolving to Host load check data. #### Defined in -[api-client/src/host-client.ts:128](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L128) +[api-client/src/host-client.ts:134](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L134) ___ @@ -254,7 +256,7 @@ Promise resolving to response with log stream. #### Defined in -[api-client/src/host-client.ts:68](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L68) +[api-client/src/host-client.ts:69](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L69) ___ @@ -279,7 +281,7 @@ Promise resolving to readable stream. #### Defined in -[api-client/src/host-client.ts:185](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L185) +[api-client/src/host-client.ts:191](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L191) ___ @@ -303,7 +305,7 @@ Promise resolving to Sequence details. #### Defined in -[api-client/src/host-client.ts:98](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L98) +[api-client/src/host-client.ts:99](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L99) ___ @@ -327,7 +329,7 @@ SequenceClient instance. #### Defined in -[api-client/src/host-client.ts:209](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L209) +[api-client/src/host-client.ts:215](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L215) ___ @@ -343,7 +345,7 @@ Returns Host status. #### Defined in -[api-client/src/host-client.ts:144](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L144) +[api-client/src/host-client.ts:150](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L150) ___ @@ -357,7 +359,7 @@ ___ #### Defined in -[api-client/src/host-client.ts:189](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L189) +[api-client/src/host-client.ts:195](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L195) ___ @@ -375,7 +377,7 @@ Promise resolving to Host version. #### Defined in -[api-client/src/host-client.ts:137](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L137) +[api-client/src/host-client.ts:143](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L143) ___ @@ -393,7 +395,7 @@ Promise resolving to list of entities. #### Defined in -[api-client/src/host-client.ts:48](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L48) +[api-client/src/host-client.ts:49](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L49) ___ @@ -411,7 +413,7 @@ Promise resolving to list of Instances. #### Defined in -[api-client/src/host-client.ts:39](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L39) +[api-client/src/host-client.ts:40](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L40) ___ @@ -429,7 +431,7 @@ Promise resolving to list of Sequences. #### Defined in -[api-client/src/host-client.ts:30](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L30) +[api-client/src/host-client.ts:31](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L31) ___ @@ -464,7 +466,7 @@ TODO: comment. #### Defined in -[api-client/src/host-client.ts:168](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L168) +[api-client/src/host-client.ts:174](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L174) ___ @@ -480,7 +482,7 @@ Uploads Sequence to Host. | :------ | :------ | :------ | | `sequencePackage` | `string` \| `Readable` | Stream with packed Sequence. | | `requestInit?` | `RequestInit` | RequestInit object to be passed to fetch. | -| `update?` | `boolean` | Send request with post or put method | +| `update?` | `boolean` | Send request with post or put method. | #### Returns @@ -490,4 +492,4 @@ Sequence client. #### Defined in -[api-client/src/host-client.ts:80](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L80) +[api-client/src/host-client.ts:81](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/api-client/src/host-client.ts#L81) diff --git a/docs/cli/commands-description.md b/docs/cli/commands-description.md index 16ee78512..becba6207 100644 --- a/docs/cli/commands-description.md +++ b/docs/cli/commands-description.md @@ -416,275 +416,31 @@ Remove existing profile configuration --- -## $ si scope | s +## $ si scope **Description** -/This functionality is under development./ Manage scopes that store pairs of spaces and Hubs used when working -**Usage** - -`si scope [command] [options...]` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si scope list | ls - -**Description** - -List all created scopes - -**Usage** - -`si scope list [options]` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si scope print - -**Description** - -See json file under the scope - -**Usage** - -`si scope print [options] ` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si scope use - -**Description** - -Work on the selected scope - -**Usage** - -`si scope use [options] ` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si scope delete - -**Description** - -Delete specific scope - -**Usage** - -`si scope delete [options] ` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si space | spc - -**Description** - -Operations on grouped and separated runtime environments that allow sharing the data within them - -**Usage** - -`si space [command] [options...]` - -**Options** - -* -c, --stdout Output to stdout (ignores -o) -* -o, --output Output path - defaults to dirname -* -h, --help Display help for command - ---- - -## $ si space info - -**Description** - -Display info about the default space - -**Usage** - -`si space info [options]` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si space list | ls - -**Description** - -List all existing spaces - -**Usage** - -`si space list [options]` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si space use - -**Description** - -Use the space - -**Usage** - -`si space use [options] ` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si space audit - -**Description** - -Fetch all audit messages from spaces - -**Usage** - -`si space audit [options]` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si space logs - -**Description** - -Fetch all logs from space **Usage** -`si space logs [options] []` - -**Arguments** - -* The name of the space (defaults to current space) +`si scope [options]` **Options** -* -h, --help Display help for command - ---- - -## $ si space disconnect - -**Description** - -Disconnect self hosted Hubs from space - -**Usage** - -`si space disconnect [options] ` - -**Arguments** - -* space_name The name of the Space - -**Options** - -* --id Hub Id -* --all Disconnects all self-hosted Hubs connected to Space (default: false) * -h, --help Display help for command --- -## $ si space access +## $ si space **Description** -Manages Access Keys for active Space - -**Usage** - -`si space access [options] [command]` - -**Options** -* -h, --help Display help for command - ---- - -## $ si space access create - -**Description** - -Create Access key for adding Hubs to active Space, i.e "Army of Darkness" - -**Usage** - -`si space access create [options] ` - -**Arguments** - -* description Key description - -**Options** - -* -h, --help Display help for command - ---- - -## $ si space access list | ls - -**Description** - -List Access Keys metadata in active Space **Usage** -`si space access list [options]` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si space access revoke - -**Description** - -Revokes Access Key in active Space - -**Usage** - -`si space access revoke [options] ` - -**Arguments** - -* access_key Access Key id +`si space [options]` **Options** @@ -708,54 +464,6 @@ Allows to run programs in different data centers, computers or devices in local --- -## $ si hub use - -**Description** - -Specify the default Hub you want to work with, all subsequent requests will be sent to this Hub - -**Usage** - -`si hub use [options] ` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si hub list | ls - -**Description** - -List all the Hubs in the default space - -**Usage** - -`si hub list [options]` - -**Options** - -* -h, --help Display help for command - ---- - -## $ si hub info - -**Description** - -Display info about the default Hub - -**Usage** - -`si hub info [options]` - -**Options** - -* -h, --help Display help for command - ---- - ## $ si hub logs **Description** @@ -1002,7 +710,7 @@ Pack (if needed), send and start the Sequence **Description** -Delete the Sequence from the Hub +Removes the Sequence from the Hub **Usage** @@ -1014,6 +722,7 @@ Delete the Sequence from the Hub **Options** +* -f, --force Forcefully removes The Sequence by killing its Instances * -h, --help Display help for command --- @@ -1483,6 +1192,22 @@ List information about topics --- +## $ si store + +**Description** + + + +**Usage** + +`si store [options]` + +**Options** + +* -h, --help Display help for command + +--- + ## $ si util | u **Description** diff --git a/docs/host/classes/CSIController.md b/docs/host/classes/CSIController.md index 18e845760..5779f4048 100644 --- a/docs/host/classes/CSIController.md +++ b/docs/host/classes/CSIController.md @@ -66,6 +66,7 @@ Handles all Instance lifecycle, exposes instance's HTTP API. - [heartBeatTick](CSIController.md#heartbeattick) - [hookupStreams](CSIController.md#hookupstreams) - [instanceStopped](CSIController.md#instancestopped) +- [kill](CSIController.md#kill) - [listenerCount](CSIController.md#listenercount) - [listeners](CSIController.md#listeners) - [main](CSIController.md#main) @@ -563,7 +564,7 @@ ___ #### Defined in -[packages/host/src/lib/csi-controller.ts:770](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L770) +[packages/host/src/lib/csi-controller.ts:775](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L775) ___ @@ -577,7 +578,7 @@ ___ #### Defined in -[packages/host/src/lib/csi-controller.ts:796](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L796) +[packages/host/src/lib/csi-controller.ts:801](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L801) ___ @@ -591,7 +592,7 @@ ___ #### Defined in -[packages/host/src/lib/csi-controller.ts:800](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L800) +[packages/host/src/lib/csi-controller.ts:805](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L805) ___ @@ -623,7 +624,7 @@ ___ #### Defined in -[packages/host/src/lib/csi-controller.ts:792](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L792) +[packages/host/src/lib/csi-controller.ts:797](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L797) ___ @@ -683,7 +684,7 @@ ___ #### Defined in -[packages/host/src/lib/csi-controller.ts:851](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L851) +[packages/host/src/lib/csi-controller.ts:856](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L856) ___ @@ -703,7 +704,7 @@ ___ #### Defined in -[packages/host/src/lib/csi-controller.ts:805](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L805) +[packages/host/src/lib/csi-controller.ts:810](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L810) ___ @@ -723,7 +724,7 @@ ___ #### Defined in -[packages/host/src/lib/csi-controller.ts:824](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L824) +[packages/host/src/lib/csi-controller.ts:829](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L829) ___ @@ -775,6 +776,27 @@ ___ ___ +### kill + +▸ **kill**(`opts?`): `Promise`<`void`\> + +#### Parameters + +| Name | Type | Default value | +| :------ | :------ | :------ | +| `opts` | `Object` | `undefined` | +| `opts.removeImmediately` | `boolean` | `false` | + +#### Returns + +`Promise`<`void`\> + +#### Defined in + +[packages/host/src/lib/csi-controller.ts:753](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L753) + +___ + ### listenerCount ▸ **listenerCount**<`E`\>(`event`): `number` @@ -1112,7 +1134,7 @@ ___ #### Defined in -[packages/host/src/lib/csi-controller.ts:859](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L859) +[packages/host/src/lib/csi-controller.ts:864](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/csi-controller.ts#L864) ___ diff --git a/docs/host/classes/Host.md b/docs/host/classes/Host.md index 28da35973..b24222e2c 100644 --- a/docs/host/classes/Host.md +++ b/docs/host/classes/Host.md @@ -414,7 +414,7 @@ Stops running servers. #### Defined in -[packages/host/src/lib/host.ts:1151](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1151) +[packages/host/src/lib/host.ts:1162](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1162) ___ @@ -450,7 +450,7 @@ ___ #### Defined in -[packages/host/src/lib/host.ts:814](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L814) +[packages/host/src/lib/host.ts:825](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L825) ___ @@ -482,7 +482,7 @@ List of Instances. #### Defined in -[packages/host/src/lib/host.ts:1050](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1050) +[packages/host/src/lib/host.ts:1061](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1061) ___ @@ -506,7 +506,7 @@ Sequence info object. #### Defined in -[packages/host/src/lib/host.ts:1062](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1062) +[packages/host/src/lib/host.ts:1073](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1073) ___ @@ -526,7 +526,7 @@ ___ #### Defined in -[packages/host/src/lib/host.ts:801](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L801) +[packages/host/src/lib/host.ts:812](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L812) ___ @@ -550,7 +550,7 @@ List of Instances. #### Defined in -[packages/host/src/lib/host.ts:1103](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1103) +[packages/host/src/lib/host.ts:1114](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1114) ___ @@ -568,7 +568,7 @@ List of Sequences. #### Defined in -[packages/host/src/lib/host.ts:1086](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1086) +[packages/host/src/lib/host.ts:1097](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1097) ___ @@ -586,7 +586,7 @@ Size #### Defined in -[packages/host/src/lib/host.ts:1217](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1217) +[packages/host/src/lib/host.ts:1228](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1228) ___ @@ -600,7 +600,7 @@ ___ #### Defined in -[packages/host/src/lib/host.ts:1122](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1122) +[packages/host/src/lib/host.ts:1133](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1133) ___ @@ -614,7 +614,7 @@ ___ #### Defined in -[packages/host/src/lib/host.ts:1116](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1116) +[packages/host/src/lib/host.ts:1127](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1127) ___ @@ -635,7 +635,7 @@ ___ #### Defined in -[packages/host/src/lib/host.ts:644](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L644) +[packages/host/src/lib/host.ts:655](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L655) ___ @@ -683,7 +683,7 @@ ___ #### Defined in -[packages/host/src/lib/host.ts:683](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L683) +[packages/host/src/lib/host.ts:694](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L694) ___ @@ -710,7 +710,7 @@ Promise resolving to operation result. #### Defined in -[packages/host/src/lib/host.ts:781](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L781) +[packages/host/src/lib/host.ts:792](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L792) ___ @@ -730,7 +730,7 @@ ___ #### Defined in -[packages/host/src/lib/host.ts:747](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L747) +[packages/host/src/lib/host.ts:758](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L758) ___ @@ -758,7 +758,7 @@ Promise resolving to operation result object. #### Defined in -[packages/host/src/lib/host.ts:855](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L855) +[packages/host/src/lib/host.ts:866](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L866) ___ @@ -772,7 +772,7 @@ ___ #### Defined in -[packages/host/src/lib/host.ts:623](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L623) +[packages/host/src/lib/host.ts:634](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L634) ___ @@ -789,7 +789,7 @@ Used to recover Sequences information after restart. #### Defined in -[packages/host/src/lib/host.ts:662](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L662) +[packages/host/src/lib/host.ts:673](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L673) ___ @@ -875,7 +875,7 @@ ___ #### Defined in -[packages/host/src/lib/host.ts:1224](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1224) +[packages/host/src/lib/host.ts:1235](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1235) ___ @@ -909,7 +909,7 @@ Sets up telemetry. #### Defined in -[packages/host/src/lib/host.ts:1191](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1191) +[packages/host/src/lib/host.ts:1202](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1202) ___ @@ -932,7 +932,7 @@ Creates new CSIController [CSIController](CSIController.md) object and handles i #### Defined in -[packages/host/src/lib/host.ts:938](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L938) +[packages/host/src/lib/host.ts:949](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L949) ___ @@ -949,7 +949,7 @@ using its CSIController [CSIController](CSIController.md) #### Defined in -[packages/host/src/lib/host.ts:1134](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1134) +[packages/host/src/lib/host.ts:1145](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/host/src/lib/host.ts#L1145) ___ diff --git a/docs/symbols/enums/HostHeaders.md b/docs/symbols/enums/HostHeaders.md new file mode 100644 index 000000000..2f5551793 --- /dev/null +++ b/docs/symbols/enums/HostHeaders.md @@ -0,0 +1,19 @@ +[@scramjet/symbols](../README.md) / [Exports](../modules.md) / HostHeaders + +# Enumeration: HostHeaders + +## Table of contents + +### Enumeration Members + +- [SEQUENCE\_FORCE\_REMOVE](HostHeaders.md#sequence_force_remove) + +## Enumeration Members + +### SEQUENCE\_FORCE\_REMOVE + +• **SEQUENCE\_FORCE\_REMOVE** = ``"x-seq-kill-inst"`` + +#### Defined in + +[headers/host.ts:2](https://github.com/scramjetorg/transform-hub/blob/HEAD/packages/symbols/src/headers/host.ts#L2) diff --git a/docs/symbols/modules.md b/docs/symbols/modules.md index f96d826da..cf55be955 100644 --- a/docs/symbols/modules.md +++ b/docs/symbols/modules.md @@ -9,6 +9,7 @@ - [APIErrorCode](enums/APIErrorCode.md) - [CPMMessageCode](enums/CPMMessageCode.md) - [CommunicationChannel](enums/CommunicationChannel.md) +- [HostHeaders](enums/HostHeaders.md) - [InstanceMessageCode](enums/InstanceMessageCode.md) - [OpRecordCode](enums/OpRecordCode.md) - [RunnerExitCode](enums/RunnerExitCode.md) diff --git a/docs/types/classes/HostClient.md b/docs/types/classes/HostClient.md index bfb16e1c6..23ea33c98 100644 --- a/docs/types/classes/HostClient.md +++ b/docs/types/classes/HostClient.md @@ -75,13 +75,15 @@ ___ ### deleteSequence -▸ **deleteSequence**(`sequenceId`): `Promise`<[`DeleteSequenceResponse`](../modules/STHRestAPI.md#deletesequenceresponse)\> +▸ **deleteSequence**(`sequenceId`, `opts?`): `Promise`<[`DeleteSequenceResponse`](../modules/STHRestAPI.md#deletesequenceresponse)\> #### Parameters | Name | Type | | :------ | :------ | | `sequenceId` | `string` | +| `opts?` | `Object` | +| `opts.force` | `boolean` | #### Returns diff --git a/package-lock.json b/package-lock.json index e4c1fca1c..40df7580c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scramjet/transform-hub", - "version": "0.33.5", + "version": "0.34.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scramjet/transform-hub", - "version": "0.33.5", + "version": "0.34.3", "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { @@ -35,7 +35,7 @@ "husky": "^6.0.0", "nyc": "^15.1.0", "patch-package": "6.4.7", - "semver": "^7.3.8", + "semver": "^7.5.2", "syncpack": "^5.8.15", "tar": "^6.1.11", "toposort": "^2.0.2", @@ -62,13 +62,13 @@ }, "bdd": { "name": "scramjet-bdd", - "version": "0.33.5", + "version": "0.34.3", "license": "ISC", "dependencies": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/logger": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", + "@scramjet/api-client": "^0.34.3", + "@scramjet/logger": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", "dockerode": "^3.3.4", "find-package-json": "^1.2.0", "freeport": "^1.0.5", @@ -78,7 +78,7 @@ "devDependencies": { "@cucumber/cucumber": "^7.3.2", "@cucumber/pretty-formatter": "^1.0.0", - "@scramjet/types": "^0.33.5" + "@scramjet/types": "^0.34.3" } }, "node_modules/@ampproject/remapping": { @@ -2327,16 +2327,6 @@ "string-width": "^4.1.0" } }, - "node_modules/ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6" - } - }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -4195,19 +4185,6 @@ "once": "^1.4.0" } }, - "node_modules/enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "peer": true, - "dependencies": { - "ansi-colors": "^4.1.1" - }, - "engines": { - "node": ">=8.6" - } - }, "node_modules/env-paths": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", @@ -5640,12 +5617,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", - "dev": true - }, "node_modules/functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", @@ -7298,13 +7269,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", - "dev": true, - "peer": true - }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -12300,16 +12264,6 @@ "node": ">=0.10.0" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/require-main-filename": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", @@ -12571,9 +12525,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz", + "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -12770,24 +12724,6 @@ "node": ">=8" } }, - "node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "peer": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, "node_modules/smart-buffer": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", @@ -13373,47 +13309,6 @@ "url": "https://www.buymeacoffee.com/systeminfo" } }, - "node_modules/table": { - "version": "6.8.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz", - "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==", - "dev": true, - "peer": true, - "dependencies": { - "ajv": "^8.0.1", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", - "dev": true, - "peer": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/table/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true, - "peer": true - }, "node_modules/tar": { "version": "6.1.13", "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", @@ -14116,13 +14011,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true, - "peer": true - }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", @@ -14641,18 +14529,18 @@ }, "packages/adapters": { "name": "@scramjet/adapters", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { "@kubernetes/client-node": "^0.17.1", - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/pre-runner": "^0.33.5", - "@scramjet/python-runner": "^0.33.5", - "@scramjet/runner": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/pre-runner": "^0.34.3", + "@scramjet/python-runner": "^0.34.3", + "@scramjet/runner": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/utility": "^0.34.3", "dockerode": "^3.3.4", "scramjet": "^4.36.9", "shell-escape": "^0.2.0", @@ -14660,7 +14548,7 @@ "ts.data.json": "^2.2.0" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/dockerode": "<=3.3.3", "@types/js-yaml": "4.0.5", "@types/node": "15.12.5", @@ -14676,17 +14564,17 @@ }, "packages/api-client": { "name": "@scramjet/api-client", - "version": "0.33.5", + "version": "0.34.3", "license": "MIT", "dependencies": { - "@scramjet/client-utils": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/symbols": "^0.33.5", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/symbols": "^0.34.3", "n-readlines": "^1.0.1", "scramjet": "^4.36.9" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", @@ -14697,19 +14585,19 @@ }, "packages/api-server": { "name": "@scramjet/api-server", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/utility": "^0.34.3", "0http": "^3.4.1", "http-status-codes": "^2.2.0", "scramjet": "^4.36.9" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "@types/sinon": "^10.0.13", "@types/trouter": "^3.1.1", @@ -14724,15 +14612,15 @@ }, "packages/cli": { "name": "@scramjet/cli", - "version": "0.33.5", + "version": "0.34.3", "hasInstallScript": true, "license": "AGPL-3.0", "dependencies": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/client-utils": "^0.33.5", - "@scramjet/middleware-api-client": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/api-client": "^0.34.3", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/middleware-api-client": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/utility": "^0.34.3", "chalk": "^4.1.2", "commander": "^9.5.0", "commander-completion": "^1.0.1", @@ -14746,7 +14634,7 @@ "si": "src/bin/index.ts" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/find-package-json": "^1.2.3", "@types/minimatch": "^3.0.5", "@types/node": "15.12.5", @@ -14770,14 +14658,14 @@ }, "packages/client-utils": { "name": "@scramjet/client-utils", - "version": "0.33.5", + "version": "0.34.3", "license": "MIT", "dependencies": { - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/utility": "^0.34.3", "abort-controller": "^3.0.0", "n-readlines": "^1.0.1", "node-fetch": "^2.6.7", @@ -14785,7 +14673,7 @@ "scramjet": "^4.36.9" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "@types/node-fetch": "^2.6.2", "ava": "^3.15.0", @@ -14805,19 +14693,19 @@ }, "packages/host": { "name": "@scramjet/host", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { - "@scramjet/adapters": "^0.33.5", - "@scramjet/api-server": "^0.33.5", - "@scramjet/load-check": "^0.33.5", - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/telemetry": "^0.33.5", - "@scramjet/utility": "^0.33.5", - "@scramjet/verser": "^0.33.5", + "@scramjet/adapters": "^0.34.3", + "@scramjet/api-server": "^0.34.3", + "@scramjet/load-check": "^0.34.3", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/telemetry": "^0.34.3", + "@scramjet/utility": "^0.34.3", + "@scramjet/verser": "^0.34.3", "bpmux": "^8.2.1", "ext-ip": "^0.3.9", "find-package-json": "^1.2.0", @@ -14829,7 +14717,7 @@ "systeminformation": "^5.12.7" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/find-package-json": "^1.2.3", "@types/node": "15.12.5", "ava": "^3.15.0", @@ -14841,17 +14729,17 @@ }, "packages/load-check": { "name": "@scramjet/load-check", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/utility": "^0.34.3", "scramjet": "^4.36.9", "systeminformation": "^5.12.7", "uuid": "^8.3.2" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "@types/uuid": "^8.3.4", "ava": "^3.15.0", @@ -14863,13 +14751,13 @@ }, "packages/logger": { "name": "@scramjet/logger", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { "scramjet": "^4.36.9" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "nyc": "^15.1.0", @@ -14881,14 +14769,14 @@ }, "packages/manager-api-client": { "name": "@scramjet/manager-api-client", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/client-utils": "^0.33.5" + "@scramjet/api-client": "^0.34.3", + "@scramjet/client-utils": "^0.34.3" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", @@ -14899,16 +14787,16 @@ }, "packages/middleware-api-client": { "name": "@scramjet/middleware-api-client", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/client-utils": "^0.33.5", - "@scramjet/manager-api-client": "^0.33.5", - "@scramjet/multi-manager-api-client": "^0.33.5" + "@scramjet/api-client": "^0.34.3", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/manager-api-client": "^0.34.3", + "@scramjet/multi-manager-api-client": "^0.34.3" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "ava": "^3.15.0", "esbuild": "^0.14.54", "ts-node": "^10.9.1", @@ -14919,16 +14807,16 @@ }, "packages/model": { "name": "@scramjet/model", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/symbols": "^0.33.5", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/symbols": "^0.34.3", "scramjet": "^4.36.9", "uuid": "^8.3.2" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "@types/uuid": "^8.3.4", "ava": "^3.15.0", @@ -14940,15 +14828,15 @@ }, "packages/multi-manager-api-client": { "name": "@scramjet/multi-manager-api-client", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/client-utils": "^0.33.5", - "@scramjet/manager-api-client": "^0.33.5" + "@scramjet/api-client": "^0.34.3", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/manager-api-client": "^0.34.3" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", @@ -14959,14 +14847,14 @@ }, "packages/obj-logger": { "name": "@scramjet/obj-logger", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { - "@scramjet/utility": "^0.33.5", + "@scramjet/utility": "^0.34.3", "scramjet": "^4.36.9" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "nyc": "^15.1.0", @@ -14978,30 +14866,30 @@ }, "packages/pre-runner": { "name": "@scramjet/pre-runner", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0" }, "packages/python-runner": { "name": "@scramjet/python-runner", - "version": "0.33.5", + "version": "0.34.3", "license": "MIT" }, "packages/runner": { "name": "@scramjet/runner", - "version": "0.33.5", + "version": "0.34.3", "license": "MIT", "dependencies": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/client-utils": "^0.33.5", - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/api-client": "^0.34.3", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/utility": "^0.34.3", "bpmux": "^8.2.1", "scramjet": "^4.36.9" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "@types/sinon": "^10.0.13", "ava": "^3.15.0", @@ -15016,7 +14904,7 @@ }, "packages/sth": { "name": "@scramjet/sth", - "version": "0.33.5", + "version": "0.34.3", "funding": [ { "type": "github", @@ -15029,10 +14917,10 @@ ], "license": "AGPL-3.0", "dependencies": { - "@scramjet/host": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/host": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/utility": "^0.34.3", "commander": "^8.3.0" }, "bin": { @@ -15040,13 +14928,10 @@ "sth": "src/bin/hub.ts" }, "devDependencies": { - "@scramjet/model": "^0.33.5", - "@scramjet/types": "^0.33.5", + "@scramjet/model": "^0.34.3", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", "ava": "^3.15.0", - "eslint-plugin-import": "^2.26.0", "ts-node": "^10.9.1", "typedoc": "^0.23.17", "typedoc-plugin-markdown": "^3.13.6", @@ -15055,231 +14940,18 @@ }, "packages/sth-config": { "name": "@scramjet/sth-config", - "version": "0.33.5", + "version": "0.34.3", "license": "ISC", "dependencies": { - "@scramjet/utility": "^0.33.5" + "@scramjet/utility": "^0.34.3" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "ava": "^3.15.0", "typedoc": "^0.23.17", "typedoc-plugin-markdown": "^3.13.6" } }, - "packages/sth/node_modules/@babel/code-frame": { - "version": "7.12.11", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "packages/sth/node_modules/@eslint/eslintrc": { - "version": "0.4.3", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "packages/sth/node_modules/@eslint/eslintrc/node_modules/ignore": { - "version": "4.0.6", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">= 4" - } - }, - "packages/sth/node_modules/@humanwhocodes/config-array": { - "version": "0.5.0", - "dev": true, - "license": "Apache-2.0", - "peer": true, - "dependencies": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "packages/sth/node_modules/@typescript-eslint/eslint-plugin": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz", - "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/experimental-utils": "4.33.0", - "@typescript-eslint/scope-manager": "4.33.0", - "debug": "^4.3.1", - "functional-red-black-tree": "^1.0.1", - "ignore": "^5.1.8", - "regexpp": "^3.1.0", - "semver": "^7.3.5", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^4.0.0", - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "packages/sth/node_modules/@typescript-eslint/parser": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz", - "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/scope-manager": "4.33.0", - "@typescript-eslint/types": "4.33.0", - "@typescript-eslint/typescript-estree": "4.33.0", - "debug": "^4.3.1" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "packages/sth/node_modules/@typescript-eslint/scope-manager": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz", - "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "4.33.0", - "@typescript-eslint/visitor-keys": "4.33.0" - }, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "packages/sth/node_modules/@typescript-eslint/types": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz", - "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "packages/sth/node_modules/@typescript-eslint/typescript-estree": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz", - "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/types": "4.33.0", - "@typescript-eslint/visitor-keys": "4.33.0", - "debug": "^4.3.1", - "globby": "^11.0.3", - "is-glob": "^4.0.1", - "semver": "^7.3.5", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "packages/sth/node_modules/@typescript-eslint/visitor-keys": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz", - "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "4.33.0", - "eslint-visitor-keys": "^2.0.0" - }, - "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "packages/sth/node_modules/acorn": { - "version": "7.4.1", - "dev": true, - "license": "MIT", - "peer": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "packages/sth/node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "peer": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, "packages/sth/node_modules/commander": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", @@ -15289,159 +14961,9 @@ "node": ">= 12" } }, - "packages/sth/node_modules/eslint": { - "version": "7.32.0", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", - "@humanwhocodes/config-array": "^0.5.0", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "enquirer": "^2.3.5", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^6.0.9", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "packages/sth/node_modules/eslint-utils": { - "version": "2.1.0", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "eslint-visitor-keys": "^1.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" - } - }, - "packages/sth/node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "dev": true, - "license": "Apache-2.0", - "peer": true, - "engines": { - "node": ">=4" - } - }, - "packages/sth/node_modules/eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=10" - } - }, - "packages/sth/node_modules/eslint/node_modules/ignore": { - "version": "4.0.6", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">= 4" - } - }, - "packages/sth/node_modules/espree": { - "version": "7.3.1", - "dev": true, - "license": "BSD-2-Clause", - "peer": true, - "dependencies": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "packages/sth/node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "dev": true, - "license": "Apache-2.0", - "peer": true, - "engines": { - "node": ">=4" - } - }, - "packages/sth/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "peer": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "packages/sth/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "peer": true, - "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "packages/symbols": { "name": "@scramjet/symbols", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "devDependencies": { "@types/node": "15.12.5", @@ -15452,16 +14974,16 @@ }, "packages/telemetry": { "name": "@scramjet/telemetry", - "version": "0.33.5", + "version": "0.34.3", "license": "ISC", "dependencies": { - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/utility": "^0.34.3", "winston": "^3.8.2", "winston-loki": "^6.0.6" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "ava": "^3.15.0", "typedoc": "^0.23.17", "typedoc-plugin-markdown": "^3.13.6" @@ -15469,10 +14991,10 @@ }, "packages/types": { "name": "@scramjet/types", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { - "@scramjet/symbols": "^0.33.5", + "@scramjet/symbols": "^0.34.3", "http-status-codes": "^2.2.0" }, "devDependencies": { @@ -15485,14 +15007,14 @@ }, "packages/utility": { "name": "@scramjet/utility", - "version": "0.33.5", + "version": "0.34.3", "license": "ISC", "dependencies": { "normalize-url": "4", "yaml": "^2.2.2" }, "devDependencies": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "ava": "^4.3.3", "typed-emitter": "^1.4.0", "typedoc": "^0.23.17", @@ -16305,16 +15827,16 @@ }, "packages/verser": { "name": "@scramjet/verser", - "version": "0.33.5", + "version": "0.34.3", "license": "AGPL-3.0", "dependencies": { - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/utility": "^0.34.3", "bpmux": "^8.2.1" }, "devDependencies": { - "@scramjet/api-server": "^0.33.5", - "@scramjet/types": "^0.33.5", + "@scramjet/api-server": "^0.34.3", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", @@ -17509,15 +17031,15 @@ "version": "file:packages/adapters", "requires": { "@kubernetes/client-node": "^0.17.1", - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/pre-runner": "^0.33.5", - "@scramjet/python-runner": "^0.33.5", - "@scramjet/runner": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/pre-runner": "^0.34.3", + "@scramjet/python-runner": "^0.34.3", + "@scramjet/runner": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "@types/dockerode": "<=3.3.3", "@types/js-yaml": "4.0.5", "@types/node": "15.12.5", @@ -17539,10 +17061,10 @@ "@scramjet/api-client": { "version": "file:packages/api-client", "requires": { - "@scramjet/client-utils": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/types": "^0.33.5", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "n-readlines": "^1.0.1", @@ -17556,11 +17078,11 @@ "@scramjet/api-server": { "version": "file:packages/api-server", "requires": { - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "@types/node": "15.12.5", "@types/sinon": "^10.0.13", "@types/trouter": "^3.1.1", @@ -17579,12 +17101,12 @@ "@scramjet/cli": { "version": "file:packages/cli", "requires": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/client-utils": "^0.33.5", - "@scramjet/middleware-api-client": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/api-client": "^0.34.3", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/middleware-api-client": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "@types/find-package-json": "^1.2.3", "@types/minimatch": "^3.0.5", "@types/node": "15.12.5", @@ -17615,12 +17137,12 @@ "@scramjet/client-utils": { "version": "file:packages/client-utils", "requires": { - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "@types/node": "15.12.5", "@types/node-fetch": "^2.6.2", "abort-controller": "^3.0.0", @@ -17645,17 +17167,17 @@ "@scramjet/host": { "version": "file:packages/host", "requires": { - "@scramjet/adapters": "^0.33.5", - "@scramjet/api-server": "^0.33.5", - "@scramjet/load-check": "^0.33.5", - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/telemetry": "^0.33.5", - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", - "@scramjet/verser": "^0.33.5", + "@scramjet/adapters": "^0.34.3", + "@scramjet/api-server": "^0.34.3", + "@scramjet/load-check": "^0.34.3", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/telemetry": "^0.34.3", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", + "@scramjet/verser": "^0.34.3", "@types/find-package-json": "^1.2.3", "@types/node": "15.12.5", "ava": "^3.15.0", @@ -17677,9 +17199,9 @@ "@scramjet/load-check": { "version": "file:packages/load-check", "requires": { - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "@types/node": "15.12.5", "@types/uuid": "^8.3.4", "ava": "^3.15.0", @@ -17695,7 +17217,7 @@ "@scramjet/logger": { "version": "file:packages/logger", "requires": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "nyc": "^15.1.0", @@ -17709,9 +17231,9 @@ "@scramjet/manager-api-client": { "version": "file:packages/manager-api-client", "requires": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/client-utils": "^0.33.5", - "@scramjet/types": "^0.33.5", + "@scramjet/api-client": "^0.34.3", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", @@ -17723,11 +17245,11 @@ "@scramjet/middleware-api-client": { "version": "file:packages/middleware-api-client", "requires": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/client-utils": "^0.33.5", - "@scramjet/manager-api-client": "^0.33.5", - "@scramjet/multi-manager-api-client": "^0.33.5", - "@scramjet/types": "^0.33.5", + "@scramjet/api-client": "^0.34.3", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/manager-api-client": "^0.34.3", + "@scramjet/multi-manager-api-client": "^0.34.3", + "@scramjet/types": "^0.34.3", "ava": "^3.15.0", "esbuild": "^0.14.54", "ts-node": "^10.9.1", @@ -17739,9 +17261,9 @@ "@scramjet/model": { "version": "file:packages/model", "requires": { - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/types": "^0.33.5", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "@types/uuid": "^8.3.4", "ava": "^3.15.0", @@ -17756,10 +17278,10 @@ "@scramjet/multi-manager-api-client": { "version": "file:packages/multi-manager-api-client", "requires": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/client-utils": "^0.33.5", - "@scramjet/manager-api-client": "^0.33.5", - "@scramjet/types": "^0.33.5", + "@scramjet/api-client": "^0.34.3", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/manager-api-client": "^0.34.3", + "@scramjet/types": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", @@ -17771,8 +17293,8 @@ "@scramjet/obj-logger": { "version": "file:packages/obj-logger", "requires": { - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "nyc": "^15.1.0", @@ -17792,13 +17314,13 @@ "@scramjet/runner": { "version": "file:packages/runner", "requires": { - "@scramjet/api-client": "^0.33.5", - "@scramjet/client-utils": "^0.33.5", - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/symbols": "^0.33.5", - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/api-client": "^0.34.3", + "@scramjet/client-utils": "^0.34.3", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/symbols": "^0.34.3", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "@types/node": "15.12.5", "@types/sinon": "^10.0.13", "ava": "^3.15.0", @@ -17816,274 +17338,33 @@ "@scramjet/sth": { "version": "file:packages/sth", "requires": { - "@scramjet/host": "^0.33.5", - "@scramjet/model": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/host": "^0.34.3", + "@scramjet/model": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "@types/node": "15.12.5", - "@typescript-eslint/eslint-plugin": "^4.33.0", - "@typescript-eslint/parser": "^4.33.0", "ava": "^3.15.0", "commander": "^8.3.0", - "eslint-plugin-import": "^2.26.0", "ts-node": "^10.9.1", "typedoc": "^0.23.17", "typedoc-plugin-markdown": "^3.13.6", "typescript": "~4.7.4" }, "dependencies": { - "@babel/code-frame": { - "version": "7.12.11", - "dev": true, - "peer": true, - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@eslint/eslintrc": { - "version": "0.4.3", - "dev": true, - "peer": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^13.9.0", - "ignore": "^4.0.6", - "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "ignore": { - "version": "4.0.6", - "dev": true, - "peer": true - } - } - }, - "@humanwhocodes/config-array": { - "version": "0.5.0", - "dev": true, - "peer": true, - "requires": { - "@humanwhocodes/object-schema": "^1.2.0", - "debug": "^4.1.1", - "minimatch": "^3.0.4" - } - }, - "@typescript-eslint/eslint-plugin": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz", - "integrity": "sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg==", - "dev": true, - "requires": { - "@typescript-eslint/experimental-utils": "4.33.0", - "@typescript-eslint/scope-manager": "4.33.0", - "debug": "^4.3.1", - "functional-red-black-tree": "^1.0.1", - "ignore": "^5.1.8", - "regexpp": "^3.1.0", - "semver": "^7.3.5", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/parser": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.33.0.tgz", - "integrity": "sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==", - "dev": true, - "requires": { - "@typescript-eslint/scope-manager": "4.33.0", - "@typescript-eslint/types": "4.33.0", - "@typescript-eslint/typescript-estree": "4.33.0", - "debug": "^4.3.1" - } - }, - "@typescript-eslint/scope-manager": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz", - "integrity": "sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==", - "dev": true, - "requires": { - "@typescript-eslint/types": "4.33.0", - "@typescript-eslint/visitor-keys": "4.33.0" - } - }, - "@typescript-eslint/types": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz", - "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==", - "dev": true - }, - "@typescript-eslint/typescript-estree": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz", - "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==", - "dev": true, - "requires": { - "@typescript-eslint/types": "4.33.0", - "@typescript-eslint/visitor-keys": "4.33.0", - "debug": "^4.3.1", - "globby": "^11.0.3", - "is-glob": "^4.0.1", - "semver": "^7.3.5", - "tsutils": "^3.21.0" - } - }, - "@typescript-eslint/visitor-keys": { - "version": "4.33.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz", - "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==", - "dev": true, - "requires": { - "@typescript-eslint/types": "4.33.0", - "eslint-visitor-keys": "^2.0.0" - } - }, - "acorn": { - "version": "7.4.1", - "dev": true, - "peer": true - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "peer": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, "commander": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==" - }, - "eslint": { - "version": "7.32.0", - "dev": true, - "peer": true, - "requires": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.3", - "@humanwhocodes/config-array": "^0.5.0", - "ajv": "^6.10.0", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "enquirer": "^2.3.5", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", - "esquery": "^1.4.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.1.2", - "globals": "^13.6.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.0.4", - "natural-compare": "^1.4.0", - "optionator": "^0.9.1", - "progress": "^2.0.0", - "regexpp": "^3.1.0", - "semver": "^7.2.1", - "strip-ansi": "^6.0.0", - "strip-json-comments": "^3.1.0", - "table": "^6.0.9", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" - }, - "dependencies": { - "ignore": { - "version": "4.0.6", - "dev": true, - "peer": true - } - } - }, - "eslint-utils": { - "version": "2.1.0", - "dev": true, - "peer": true, - "requires": { - "eslint-visitor-keys": "^1.1.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "dev": true, - "peer": true - } - } - }, - "eslint-visitor-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", - "dev": true - }, - "espree": { - "version": "7.3.1", - "dev": true, - "peer": true, - "requires": { - "acorn": "^7.4.0", - "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "dev": true, - "peer": true - } - } - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "peer": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "peer": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } } } }, "@scramjet/sth-config": { "version": "file:packages/sth-config", "requires": { - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "ava": "^3.15.0", "typedoc": "^0.23.17", "typedoc-plugin-markdown": "^3.13.6" @@ -18101,9 +17382,9 @@ "@scramjet/telemetry": { "version": "file:packages/telemetry", "requires": { - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "ava": "^3.15.0", "typedoc": "^0.23.17", "typedoc-plugin-markdown": "^3.13.6", @@ -18114,7 +17395,7 @@ "@scramjet/types": { "version": "file:packages/types", "requires": { - "@scramjet/symbols": "^0.33.5", + "@scramjet/symbols": "^0.34.3", "@types/node": "15.12.5", "http-status-codes": "^2.2.0", "scramjet": "^4.36.9", @@ -18126,7 +17407,7 @@ "@scramjet/utility": { "version": "file:packages/utility", "requires": { - "@scramjet/types": "^0.33.5", + "@scramjet/types": "^0.34.3", "ava": "^4.3.3", "normalize-url": "4", "typed-emitter": "^1.4.0", @@ -18635,10 +17916,10 @@ "@scramjet/verser": { "version": "file:packages/verser", "requires": { - "@scramjet/api-server": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/types": "^0.33.5", - "@scramjet/utility": "^0.33.5", + "@scramjet/api-server": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/types": "^0.34.3", + "@scramjet/utility": "^0.34.3", "@types/node": "15.12.5", "ava": "^3.15.0", "bpmux": "^8.2.1", @@ -19150,13 +18431,6 @@ "string-width": "^4.1.0" } }, - "ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true, - "peer": true - }, "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -20569,16 +19843,6 @@ "once": "^1.4.0" } }, - "enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "peer": true, - "requires": { - "ansi-colors": "^4.1.1" - } - }, "env-paths": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", @@ -21581,12 +20845,6 @@ "functions-have-names": "^1.2.2" } }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", - "dev": true - }, "functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", @@ -22799,13 +22057,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", - "dev": true, - "peer": true - }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -26481,13 +25732,6 @@ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "peer": true - }, "require-main-filename": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", @@ -26652,11 +25896,11 @@ "requires": { "@cucumber/cucumber": "^7.3.2", "@cucumber/pretty-formatter": "^1.0.0", - "@scramjet/api-client": "^0.33.5", - "@scramjet/logger": "^0.33.5", - "@scramjet/obj-logger": "^0.33.5", - "@scramjet/sth-config": "^0.33.5", - "@scramjet/types": "^0.33.5", + "@scramjet/api-client": "^0.34.3", + "@scramjet/logger": "^0.34.3", + "@scramjet/obj-logger": "^0.34.3", + "@scramjet/sth-config": "^0.34.3", + "@scramjet/types": "^0.34.3", "dockerode": "^3.3.4", "find-package-json": "^1.2.0", "freeport": "^1.0.5", @@ -26676,9 +25920,9 @@ "dev": true }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz", + "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -26833,18 +26077,6 @@ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "peer": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, "smart-buffer": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", @@ -27280,42 +26512,6 @@ "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.4.tgz", "integrity": "sha512-mEiIYrw7X5ABX8tJUgzbumQAuFQxNyHdZDz6+UtwNKUbKgIoZqLtug2z1spFB/LiXZne5tdPBJOlvVckbvfhiQ==" }, - "table": { - "version": "6.8.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz", - "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==", - "dev": true, - "peer": true, - "requires": { - "ajv": "^8.0.1", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "ajv": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", - "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", - "dev": true, - "peer": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true, - "peer": true - } - } - }, "tar": { "version": "6.1.13", "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz", @@ -27851,13 +27047,6 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" }, - "v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true, - "peer": true - }, "v8-compile-cache-lib": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", diff --git a/package.json b/package.json index 8e703f309..f4b6d7c2b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/transform-hub", - "version": "0.34.3", + "version": "0.34.4", "private": true, "description": "A development repo for Scramjet Transform Hub, a container supervisor that allows deployment, execution and monitoring of any application based on a simple interface.", "main": "index.js", @@ -92,7 +92,7 @@ "husky": "^6.0.0", "nyc": "^15.1.0", "patch-package": "6.4.7", - "semver": "^7.3.8", + "semver": "^7.5.2", "syncpack": "^5.8.15", "tar": "^6.1.11", "toposort": "^2.0.2", diff --git a/packages/adapters/package.json b/packages/adapters/package.json index c0df651ce..d70625b25 100644 --- a/packages/adapters/package.json +++ b/packages/adapters/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/adapters", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. This module holds the docker adapters utilized by Scramjet Transform Hub", "main": "./src/index.ts", "scripts": { @@ -16,14 +16,14 @@ "license": "AGPL-3.0", "dependencies": { "@kubernetes/client-node": "^0.17.1", - "@scramjet/model": "^0.34.3", - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/pre-runner": "^0.34.3", - "@scramjet/python-runner": "^0.34.3", - "@scramjet/runner": "^0.34.3", - "@scramjet/sth-config": "^0.34.3", - "@scramjet/symbols": "^0.34.3", - "@scramjet/utility": "^0.34.3", + "@scramjet/model": "^0.34.4", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/pre-runner": "^0.34.4", + "@scramjet/python-runner": "^0.34.4", + "@scramjet/runner": "^0.34.4", + "@scramjet/sth-config": "^0.34.4", + "@scramjet/symbols": "^0.34.4", + "@scramjet/utility": "^0.34.4", "dockerode": "^3.3.4", "scramjet": "^4.36.9", "shell-escape": "^0.2.0", @@ -31,7 +31,7 @@ "ts.data.json": "^2.2.0" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/dockerode": "<=3.3.3", "@types/js-yaml": "4.0.5", "@types/node": "15.12.5", diff --git a/packages/api-client/package.json b/packages/api-client/package.json index baa1dfe6c..063433181 100644 --- a/packages/api-client/package.json +++ b/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/api-client", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides the API Client for use with Scramjet Transform Hub.", "main": "./src/index.ts", "scripts": { @@ -13,14 +13,14 @@ "author": "Scramjet ", "license": "MIT", "dependencies": { - "@scramjet/client-utils": "^0.34.3", - "@scramjet/sth-config": "^0.34.3", - "@scramjet/symbols": "^0.34.3", + "@scramjet/client-utils": "^0.34.4", + "@scramjet/sth-config": "^0.34.4", + "@scramjet/symbols": "^0.34.4", "n-readlines": "^1.0.1", "scramjet": "^4.36.9" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", diff --git a/packages/api-client/src/host-client.ts b/packages/api-client/src/host-client.ts index 21e06de3a..86c1c8c53 100644 --- a/packages/api-client/src/host-client.ts +++ b/packages/api-client/src/host-client.ts @@ -2,6 +2,7 @@ import { ClientProvider, ClientUtils, HttpClient } from "@scramjet/client-utils" import { STHRestAPI } from "@scramjet/types"; import { InstanceClient } from "./instance-client"; import { SequenceClient } from "./sequence-client"; +import { HostHeaders } from "@scramjet/symbols"; /** * Host client. @@ -74,7 +75,7 @@ export class HostClient implements ClientProvider { * * @param sequencePackage Stream with packed Sequence. * @param {RequestInit} requestInit RequestInit object to be passed to fetch. - * @param {boolean} update Send request with post or put method + * @param {boolean} update Send request with post or put method. * @returns {SequenceClient} Sequence client. */ async sendSequence( @@ -102,11 +103,16 @@ export class HostClient implements ClientProvider { /** * Deletes Sequence with given id. * - * @param {string} sequenceId Sequence id + * @param {string} sequenceId Sequence id. + * @param {any} opts Additional sequence delete options. * @returns {STHRestAPI.Promise} Promise resolving to delete Sequence result. */ - async deleteSequence(sequenceId: string): Promise { - return this.client.delete(`sequence/${sequenceId}`); + async deleteSequence(sequenceId: string, opts?: { force: boolean }): Promise { + const headers: HeadersInit = {}; + + if (opts?.force) headers[HostHeaders.SEQUENCE_FORCE_REMOVE] = "true"; + + return this.client.delete(`sequence/${sequenceId}`, { headers }); } // REVIEW: move this to InstanceClient..getInfo()? diff --git a/packages/api-server/package.json b/packages/api-server/package.json index f096c2afa..6f71d9745 100644 --- a/packages/api-server/package.json +++ b/packages/api-server/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/api-server", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides the domain model for STH and the CLI.", "main": "./src/index.ts", "scripts": { @@ -15,15 +15,15 @@ "license": "AGPL-3.0", "dependencies": { "0http": "^3.4.1", - "@scramjet/model": "^0.34.3", - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/symbols": "^0.34.3", - "@scramjet/utility": "^0.34.3", + "@scramjet/model": "^0.34.4", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/symbols": "^0.34.4", + "@scramjet/utility": "^0.34.4", "http-status-codes": "^2.2.0", "scramjet": "^4.36.9" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "@types/sinon": "^10.0.13", "@types/trouter": "^3.1.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 03b3e0cb0..18e22c03f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/cli", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides a CLI interface to communicate with Scramjet Transform Hub.", "main": "./src/index.ts", "bin": { @@ -20,11 +20,11 @@ "author": "Scramjet ", "license": "AGPL-3.0", "dependencies": { - "@scramjet/api-client": "^0.34.3", - "@scramjet/client-utils": "^0.34.3", - "@scramjet/middleware-api-client": "^0.34.3", - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/utility": "^0.34.3", + "@scramjet/api-client": "^0.34.4", + "@scramjet/client-utils": "^0.34.4", + "@scramjet/middleware-api-client": "^0.34.4", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/utility": "^0.34.4", "chalk": "^4.1.2", "commander": "^9.5.0", "commander-completion": "^1.0.1", @@ -35,7 +35,7 @@ "validator": "^13.7.0" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/find-package-json": "^1.2.3", "@types/minimatch": "^3.0.5", "@types/node": "15.12.5", diff --git a/packages/cli/src/lib/commands/scope.ts b/packages/cli/src/lib/commands/scope.ts index 68e10d543..8fd89722c 100644 --- a/packages/cli/src/lib/commands/scope.ts +++ b/packages/cli/src/lib/commands/scope.ts @@ -3,6 +3,7 @@ import { CommandDefinition, isProductionEnv } from "../../types"; import { listScopes, deleteScope, getScope, scopeExists } from "../helpers/scope"; import { displayObject } from "../output"; import { isProfileConfig, ProfileConfig, profileManager } from "../config"; +import { displayProdOnlyMsg } from "../helpers/messages"; /** * Initializes `scope` command. @@ -12,7 +13,12 @@ import { isProfileConfig, ProfileConfig, profileManager } from "../config"; export const scope: CommandDefinition = (program) => { const isProdEnv = isProductionEnv(profileManager.getProfileConfig().env); - if (!isProdEnv) return; + if (!isProdEnv) { + program.command("scope", { hidden:true }) + .action(() => displayProdOnlyMsg("scope")); + + return; + } const scopeCmd = program .command("scope") diff --git a/packages/cli/src/lib/commands/sequence.ts b/packages/cli/src/lib/commands/sequence.ts index e194020da..e5666d49e 100644 --- a/packages/cli/src/lib/commands/sequence.ts +++ b/packages/cli/src/lib/commands/sequence.ts @@ -1,7 +1,6 @@ import { CommandDefinition } from "../../types"; import { createWriteStream, lstatSync } from "fs"; -import { defer } from "@scramjet/utility"; -import { displayEntity, displayMessage, displayObject } from "../output"; +import { displayEntity, displayError, displayMessage, displayObject } from "../output"; import { getHostClient } from "../common"; import { getSequenceId, profileManager, sessionConfig } from "../config"; @@ -10,9 +9,8 @@ import { PassThrough, Writable } from "stream"; import { isDevelopment } from "../../utils/envs"; import { resolve } from "path"; -import { sequenceDelete, sequencePack, sequenceParseArgs, sequenceSendPackage, sequenceStart, waitForInstanceKills } from "../helpers/sequence"; +import { sequenceDelete, sequencePack, sequenceParseArgs, sequenceSendPackage, sequenceStart } from "../helpers/sequence"; import { ClientError } from "@scramjet/client-utils"; -import { instanceKill } from "../helpers/instance"; /** * Initializes `sequence` command. @@ -181,18 +179,17 @@ export const sequence: CommandDefinition = (program) => { .command("delete") .alias("rm") .argument("", "The Sequence id to remove or '-' for the last uploaded") - .description("Delete the Sequence from the Hub") - .action(async (id: string) => { - try { - const sequenceDeleteResponse = await sequenceDelete(id); - - displayObject(sequenceDeleteResponse, profileManager.getProfileConfig().format); - } catch (error) { - if (error instanceof ClientError && error.code === "NOT_FOUND") { - error.message = `Unable to find sequence ${id}`; - } - throw error; - } + .option("-f, --force", "Forcefully removes The Sequence by killing its Instances") + .description("Removes the Sequence from the Hub") + .action(async (id: string, { force }) => { + await sequenceDelete(id, { force }).then( + (res => { displayObject(res, profileManager.getProfileConfig().format); }), + (error => { + displayError( + JSON.parse(error?.body || { body: "Unknown error" }) + ); + }) + ); }); sequenceCmd @@ -203,7 +200,7 @@ export const sequence: CommandDefinition = (program) => { .description("Remove all Sequences from the Hub (use with caution)") .action(async ({ force }) => { let seqs = await getHostClient().listSequences(); - const { lastSequenceId, lastInstanceId } = sessionConfig.get(); + const { lastSequenceId } = sessionConfig.get(); if (!seqs.length) { displayMessage("Sequence list is empty, nothing to delete."); @@ -213,26 +210,7 @@ export const sequence: CommandDefinition = (program) => { let fullSuccess = true; await Promise.all( - seqs.map(async seq => { - const timeout = seq.instances.length * 5e3; - - if (seq.instances.length) { - if (!force) { - displayMessage(`Sequence ${seq.id} has instances. Use --force to kill those.`); - return Promise.resolve(); - } - - await Promise.all( - seq.instances.map(async instanceId => instanceKill(instanceId, true, lastInstanceId)) - ); - - displayMessage(`KILL requested for Instances of Sequence ${seq.id}. Waiting...`); - - await defer(15000); - await waitForInstanceKills(seq, timeout); - } - return sequenceDelete(seq.id, lastSequenceId); - }) + seqs.map(async seq => sequenceDelete(seq.id, { force }, lastSequenceId)) ).catch(error => { fullSuccess = false; @@ -246,6 +224,7 @@ export const sequence: CommandDefinition = (program) => { } seqs = await getHostClient().listSequences(); + sessionConfig.setLastInstanceId(""); if (seqs.length) { throw new Error("Some Sequences may have not been deleted."); diff --git a/packages/cli/src/lib/commands/space.ts b/packages/cli/src/lib/commands/space.ts index 19d325619..d433df55f 100644 --- a/packages/cli/src/lib/commands/space.ts +++ b/packages/cli/src/lib/commands/space.ts @@ -4,6 +4,7 @@ import { CommandDefinition, isProductionEnv } from "../../types"; import { profileManager, sessionConfig } from "../config"; import { displayObject, displayStream } from "../output"; import { getMiddlewareClient } from "../platform"; +import { displayProdOnlyMsg } from "../helpers/messages"; /** * Initializes `space` command. @@ -13,7 +14,12 @@ import { getMiddlewareClient } from "../platform"; export const space: CommandDefinition = (program) => { const isProdEnv = isProductionEnv(profileManager.getProfileConfig().env); - if (!isProdEnv) return; + if (!isProdEnv) { + program.command("space", { hidden: true }) + .action(() => displayProdOnlyMsg("space")); + + return; + } const spaceCmd = program .command("space") diff --git a/packages/cli/src/lib/commands/store.ts b/packages/cli/src/lib/commands/store.ts index 5caa38203..2d4069a6f 100644 --- a/packages/cli/src/lib/commands/store.ts +++ b/packages/cli/src/lib/commands/store.ts @@ -1,6 +1,7 @@ import { CommandDefinition, ExtendedHelpConfiguration, isProductionEnv } from "../../types"; import { getReadStreamFromFile } from "../common"; import { profileManager, sessionConfig } from "../config"; +import { displayProdOnlyMsg } from "../helpers/messages"; import { displayObject } from "../output"; import { getMiddlewareClient } from "../platform"; @@ -12,7 +13,12 @@ import { getMiddlewareClient } from "../platform"; export const store: CommandDefinition = (program) => { const isProdEnv = isProductionEnv(profileManager.getProfileConfig().env); - if (!isProdEnv) return; + if (!isProdEnv) { + program.command("store", { hidden:true }) + .action(() => displayProdOnlyMsg("store")); + + return; + } const storeCmd = program .command("store") diff --git a/packages/cli/src/lib/helpers/messages.ts b/packages/cli/src/lib/helpers/messages.ts new file mode 100644 index 000000000..bb1a9719d --- /dev/null +++ b/packages/cli/src/lib/helpers/messages.ts @@ -0,0 +1,8 @@ +import { displayError } from "../output"; + +export const displayProdOnlyMsg = (command: string) => { + displayError(`'${command}' command is only available in production environment +to change environment please use following command: 'si config set env production' +or check out our documentation for more details: 'https://docs.scramjet.org/platform/get-started/'`); +}; + diff --git a/packages/cli/src/lib/helpers/sequence.ts b/packages/cli/src/lib/helpers/sequence.ts index 980967962..1ccdc8de2 100644 --- a/packages/cli/src/lib/helpers/sequence.ts +++ b/packages/cli/src/lib/helpers/sequence.ts @@ -197,8 +197,10 @@ export function sequenceParseArgs(argsStr: string): any[] { return args; } -export const sequenceDelete = async (id: string, lastSequenceId = sessionConfig.lastSequenceId) => { - const deleteSequenceResponse = await getHostClient().deleteSequence(getSequenceId(id)); +export const sequenceDelete = async ( + id: string, opts = { force: false }, lastSequenceId = sessionConfig.lastSequenceId +) => { + const deleteSequenceResponse = await getHostClient().deleteSequence(getSequenceId(id), opts); if (lastSequenceId === id) { sessionConfig.setLastSequenceId(""); diff --git a/packages/cli/src/lib/platform/common.ts b/packages/cli/src/lib/platform/common.ts index fe4e35120..a87c2b6c0 100644 --- a/packages/cli/src/lib/platform/common.ts +++ b/packages/cli/src/lib/platform/common.ts @@ -36,17 +36,18 @@ export const getMiddlewareClient = (): MiddlewareClient => { }; export const setPlatformDefaults = async () => { + const middlewareClient = getMiddlewareClient(); + const managers = await middlewareClient.getManagers(); + const { lastSpaceId, lastHubId } = sessionConfig.get(); if (lastSpaceId || lastHubId) { - return false; + if (managers[0]?.id === lastSpaceId) { + return false; + } } - const middlewareClient = getMiddlewareClient(); - try { - const managers = await middlewareClient.getManagers(); - if (!managers.length) return false; const selectedManager = managers[0]; diff --git a/packages/cli/src/utils/envs.ts b/packages/cli/src/utils/envs.ts index 78b34d581..ae9748f30 100644 --- a/packages/cli/src/utils/envs.ts +++ b/packages/cli/src/utils/envs.ts @@ -5,3 +5,5 @@ export const envs = { }; export const isDevelopment = () => envs.nodeEnv === "development"; +export const isTSNode = !!(process as any)[Symbol.for("ts-node.register.instance")]; + diff --git a/packages/client-utils/package.json b/packages/client-utils/package.json index 98a51557f..71ecc9bb1 100644 --- a/packages/client-utils/package.json +++ b/packages/client-utils/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/client-utils", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides the API Client Utils for use with Scramjet Transform Hub.", "main": "./src/index.ts", "browser": "./src/index.browser.ts", @@ -14,11 +14,11 @@ "author": "Scramjet ", "license": "MIT", "dependencies": { - "@scramjet/model": "^0.34.3", - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/sth-config": "^0.34.3", - "@scramjet/symbols": "^0.34.3", - "@scramjet/utility": "^0.34.3", + "@scramjet/model": "^0.34.4", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/sth-config": "^0.34.4", + "@scramjet/symbols": "^0.34.4", + "@scramjet/utility": "^0.34.4", "abort-controller": "^3.0.0", "n-readlines": "^1.0.1", "node-fetch": "^2.6.7", @@ -26,7 +26,7 @@ "scramjet": "^4.36.9" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "@types/node-fetch": "^2.6.2", "ava": "^3.15.0", diff --git a/packages/host/package.json b/packages/host/package.json index f46415b03..105e5577f 100644 --- a/packages/host/package.json +++ b/packages/host/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/host", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides the main host subsystem of STH - starts API Servers, creates adapters etc.", "main": "./src/index.ts", "scripts": { @@ -17,16 +17,16 @@ "author": "Scramjet ", "license": "AGPL-3.0", "dependencies": { - "@scramjet/adapters": "^0.34.3", - "@scramjet/api-server": "^0.34.3", - "@scramjet/load-check": "^0.34.3", - "@scramjet/model": "^0.34.3", - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/sth-config": "^0.34.3", - "@scramjet/symbols": "^0.34.3", - "@scramjet/telemetry": "^0.34.3", - "@scramjet/utility": "^0.34.3", - "@scramjet/verser": "^0.34.3", + "@scramjet/adapters": "^0.34.4", + "@scramjet/api-server": "^0.34.4", + "@scramjet/load-check": "^0.34.4", + "@scramjet/model": "^0.34.4", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/sth-config": "^0.34.4", + "@scramjet/symbols": "^0.34.4", + "@scramjet/telemetry": "^0.34.4", + "@scramjet/utility": "^0.34.4", + "@scramjet/verser": "^0.34.4", "bpmux": "^8.2.1", "ext-ip": "^0.3.9", "find-package-json": "^1.2.0", @@ -38,7 +38,7 @@ "systeminformation": "^5.12.7" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/find-package-json": "^1.2.3", "@types/node": "15.12.5", "ava": "^3.15.0", diff --git a/packages/host/src/lib/csi-controller.ts b/packages/host/src/lib/csi-controller.ts index 81923429e..05a3f450c 100644 --- a/packages/host/src/lib/csi-controller.ts +++ b/packages/host/src/lib/csi-controller.ts @@ -743,9 +743,19 @@ export class CSIController extends TypedEmitter { if (typeof removeImmediately !== "boolean") return { opStatus: ReasonPhrases.BAD_REQUEST, error: "Invalid removeImmediately format" }; + await this.kill({ removeImmediately }); + + return { + opStatus: ReasonPhrases.ACCEPTED, + ...this.getInfo() + }; + } + + async kill(opts = { removeImmediately: false }) { if (this.status === InstanceStatus.KILLING) { await this.instanceAdapter.remove(); } + this.status = InstanceStatus.KILLING; await this.communicationHandler.sendControlMessage(RunnerMessageCode.KILL, {}); @@ -754,18 +764,13 @@ export class CSIController extends TypedEmitter { promiseTimeout(this.endOfSequence, runnerExitDelay) .catch(() => this.instanceAdapter.remove()); - if (removeImmediately) { + if (opts.removeImmediately) { this.instanceLifetimeExtensionDelay = 0; if (this.finalizingPromise) { this.finalizingPromise.cancel(); } } - - return { - opStatus: ReasonPhrases.ACCEPTED, - ...this.getInfo() - }; } getInfo(): STHRestAPI.GetInstanceResponse { diff --git a/packages/host/src/lib/host.ts b/packages/host/src/lib/host.ts index 0f828940d..99110f3e7 100644 --- a/packages/host/src/lib/host.ts +++ b/packages/host/src/lib/host.ts @@ -22,7 +22,7 @@ import { STHRestAPI, } from "@scramjet/types"; import { CommunicationHandler, HostError, IDProvider } from "@scramjet/model"; -import { InstanceMessageCode, RunnerMessageCode, SequenceMessageCode } from "@scramjet/symbols"; +import { HostHeaders, InstanceMessageCode, RunnerMessageCode, SequenceMessageCode } from "@scramjet/symbols"; import { ObjLogger, prettyPrint } from "@scramjet/obj-logger"; import { LoadCheck, LoadCheckConfig } from "@scramjet/load-check"; @@ -567,8 +567,9 @@ export class Host implements IComponent { */ async handleDeleteSequence(req: ParsedMessage): Promise> { const id = req.params?.id; + const force = req.headers[HostHeaders.SEQUENCE_FORCE_REMOVE]; - this.logger.trace("Deleting Sequence...", id); + this.logger.trace("Deleting Sequence...", id, { force }); const sequenceInfo = this.sequencesStore.get(id) || this.getSequenceByName(id); @@ -581,11 +582,12 @@ export class Host implements IComponent { if (sequenceInfo.instances.size > 0) { const instances = [...sequenceInfo.instances].every((instanceId) => { - this.instancesStore[instanceId]?.finalizingPromise?.cancel(); + // ? + // this.instancesStore[instanceId]?.finalizingPromise?.cancel(); return this.instancesStore[instanceId]?.isRunning; }); - if (instances) { + if (instances && !force) { this.logger.warn("Can't remove Sequence in use:", id); return { @@ -593,6 +595,15 @@ export class Host implements IComponent { error: "Can't remove- Sequence in use" }; } + + if (instances) { + this.logger.info(`Killing Instances from Sequence ${id}...`); + await Promise.all([...sequenceInfo.instances].map(async (instanceId) => { + await this.instancesStore[instanceId]?.kill({ removeImmediately: true }); + + return new Promise((res) => this.instancesStore[instanceId]?.once("end", res)); + })); + } } try { @@ -974,7 +985,7 @@ export class Host implements IComponent { } if (data.provides && !csic.outputRouted) { - this.logger.trace("Routing Sequence output to topic", data.requires); + this.logger.trace("Routing Sequence output to topic", data.provides); await this.serviceDiscovery.routeStreamToTopic( csic.getOutputStream(), { topic: data.provides, contentType: data.contentType! }, diff --git a/packages/load-check/package.json b/packages/load-check/package.json index 4752f7bee..970068584 100644 --- a/packages/load-check/package.json +++ b/packages/load-check/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/load-check", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides health info for STH.", "main": "./src/index.ts", "scripts": { @@ -14,14 +14,14 @@ "author": "Scramjet ", "license": "AGPL-3.0", "dependencies": { - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/utility": "^0.34.3", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/utility": "^0.34.4", "scramjet": "^4.36.9", "systeminformation": "^5.12.7", "uuid": "^8.3.2" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "@types/uuid": "^8.3.4", "ava": "^3.15.0", diff --git a/packages/logger/package.json b/packages/logger/package.json index d74d008d5..2bac9b5c7 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/logger", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides a simple logger with 100% Console Web API compatible signatures and a streaming output of any choice.", "main": "./src/index.ts", "scripts": { @@ -14,7 +14,7 @@ "author": "Scramjet ", "license": "AGPL-3.0", "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "ava": "^3.15.0", "nyc": "^15.1.0", diff --git a/packages/manager-api-client/package.json b/packages/manager-api-client/package.json index 3dd1660ff..918c6093c 100644 --- a/packages/manager-api-client/package.json +++ b/packages/manager-api-client/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/manager-api-client", - "version": "0.34.3", + "version": "0.34.4", "description": "Scramjet Manager API Client", "main": "src/index.ts", "scripts": { @@ -12,11 +12,11 @@ "test:ava": "ava" }, "dependencies": { - "@scramjet/api-client": "^0.34.3", - "@scramjet/client-utils": "^0.34.3" + "@scramjet/api-client": "^0.34.4", + "@scramjet/client-utils": "^0.34.4" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", diff --git a/packages/middleware-api-client/package.json b/packages/middleware-api-client/package.json index cf46ff871..0ed85f3c2 100644 --- a/packages/middleware-api-client/package.json +++ b/packages/middleware-api-client/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/middleware-api-client", - "version": "0.34.3", + "version": "0.34.4", "description": "Scramjet Middleware API Client", "main": "src/index.ts", "scripts": { @@ -14,13 +14,13 @@ "test:ava": "ava" }, "dependencies": { - "@scramjet/api-client": "^0.34.3", - "@scramjet/client-utils": "^0.34.3", - "@scramjet/manager-api-client": "^0.34.3", - "@scramjet/multi-manager-api-client": "^0.34.3" + "@scramjet/api-client": "^0.34.4", + "@scramjet/client-utils": "^0.34.4", + "@scramjet/manager-api-client": "^0.34.4", + "@scramjet/multi-manager-api-client": "^0.34.4" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "ava": "^3.15.0", "esbuild": "^0.14.54", "ts-node": "^10.9.1", diff --git a/packages/model/package.json b/packages/model/package.json index a0289781e..70792c0a6 100644 --- a/packages/model/package.json +++ b/packages/model/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/model", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides the domain model for STH and the CLI.", "main": "./src/index.ts", "scripts": { @@ -13,13 +13,13 @@ "author": "Scramjet ", "license": "AGPL-3.0", "dependencies": { - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/symbols": "^0.34.3", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/symbols": "^0.34.4", "scramjet": "^4.36.9", "uuid": "^8.3.2" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "@types/uuid": "^8.3.4", "ava": "^3.15.0", diff --git a/packages/multi-manager-api-client/package.json b/packages/multi-manager-api-client/package.json index 707079d99..8b5a7df3c 100644 --- a/packages/multi-manager-api-client/package.json +++ b/packages/multi-manager-api-client/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/multi-manager-api-client", - "version": "0.34.3", + "version": "0.34.4", "description": "Scramjet MultiManager API Client", "main": "src/index.ts", "scripts": { @@ -12,12 +12,12 @@ "test:ava": "ava" }, "dependencies": { - "@scramjet/api-client": "^0.34.3", - "@scramjet/client-utils": "^0.34.3", - "@scramjet/manager-api-client": "^0.34.3" + "@scramjet/api-client": "^0.34.4", + "@scramjet/client-utils": "^0.34.4", + "@scramjet/manager-api-client": "^0.34.4" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", diff --git a/packages/obj-logger/package.json b/packages/obj-logger/package.json index a66bd6b7d..330499756 100644 --- a/packages/obj-logger/package.json +++ b/packages/obj-logger/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/obj-logger", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides a simple logger with 100% Console Web API compatible signatures and a streaming output of any choice.", "main": "./src/index.ts", "scripts": { @@ -14,7 +14,7 @@ "author": "Scramjet ", "license": "AGPL-3.0", "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "ava": "^3.15.0", "nyc": "^15.1.0", @@ -24,7 +24,7 @@ "typescript": "~4.7.4" }, "dependencies": { - "@scramjet/utility": "^0.34.3", + "@scramjet/utility": "^0.34.4", "scramjet": "^4.36.9" }, "ava": { diff --git a/packages/pre-runner/package.json b/packages/pre-runner/package.json index 559f2d875..c6ef50089 100644 --- a/packages/pre-runner/package.json +++ b/packages/pre-runner/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/pre-runner", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package identifies the sequences and returns the information to back STH.", "scripts": { "build:docker": "docker build -t scramjetorg/pre-runner:$(git rev-parse HEAD) .", diff --git a/packages/python-runner/package.json b/packages/python-runner/package.json index df5a0884c..8f3d02f74 100644 --- a/packages/python-runner/package.json +++ b/packages/python-runner/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/python-runner", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package executes the remote runners and provides communication with them through abstraction layer provided by adapters.", "main": "./runner.py", "scripts": { diff --git a/packages/python-runner/runner.py b/packages/python-runner/runner.py index 667c05feb..a481d6474 100644 --- a/packages/python-runner/runner.py +++ b/packages/python-runner/runner.py @@ -24,6 +24,20 @@ def send_encoded_msg(stream, msg_code, data={}): message = json.dumps([msg_code.value, data]) stream.write(f'{message}\r\n'.encode()) +class StderrRedirector: + """A workaround class to write to both sys.stderr and the Instance stderr endpoint.""" + def __init__(self, stream): + self.stream = stream + + def write(self, message): + self.stream.write(message) + sys.__stderr__.write(message) + + def flush(self): + self.stream.flush() + sys.__stderr__.flush() + + class Runner: def __init__(self, instance_id, sequence_path, log_setup) -> None: self.instance_id = instance_id @@ -77,7 +91,7 @@ async def init_tecemux(self, server_host, server_port): def connect_stdio(self): sys.stdout = codecs.getwriter('utf-8')(self.protocol.get_channel(CC.STDOUT)) - sys.stderr = codecs.getwriter('utf-8')(self.protocol.get_channel(CC.STDERR)) + sys.stderr = StderrRedirector(codecs.getwriter('utf-8')(self.protocol.get_channel(CC.STDERR))) sys.stdin = Stream.read_from(self.protocol.get_channel(CC.STDIN)).decode('utf-8') # pretend to have API compatibiliy @@ -208,6 +222,7 @@ async def run_instance(self, config, input, args): self.exit_immediately() self.logger.info(f'Sending PANG') + monitoring = self.protocol.get_channel(CC.MONITORING) produces = getattr(result, 'provides', None) or getattr(self.sequence, 'provides', None) @@ -260,17 +275,19 @@ async def connect_input_stream(self, input_stream): self.logger.debug('Input stream forwarded to the instance.') async def forward_output_stream(self, output): - if hasattr(output, 'content_type'): - content_type = output.content_type + + if hasattr(output, 'provides'): + attribute = getattr(self.sequence, 'provides', None) + content_type = attribute['contentType'] else: - # Deprecated - if hasattr(self.sequence, 'output_type'): - content_type = self.sequence.output_type + if hasattr(self.sequence, 'provides'): + attribute = getattr(self.sequence, 'provides', None) + content_type = attribute['contentType'] else: self.logger.debug('Output type not set, using default') content_type = 'text/plain' + self.logger.info(f'Content-type: {content_type}') - if content_type == 'text/plain': self.logger.debug('Output stream will be treated as text and encoded') output = output.map(lambda s: s.encode()) diff --git a/packages/runner/package.json b/packages/runner/package.json index f618f878e..a97560264 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/runner", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package executes the remote runners and provides communication with them through abstraction layer provided by adapters.", "main": "./src/bin/start-runner.ts", "scripts": { @@ -27,7 +27,7 @@ "scramjet": "^4.36.9" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "@types/sinon": "^10.0.13", "ava": "^3.15.0", diff --git a/packages/sth-config/package.json b/packages/sth-config/package.json index e76fcfc05..6889b4686 100644 --- a/packages/sth-config/package.json +++ b/packages/sth-config/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/sth-config", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package executes the sequences and controls the runner via the wired adapter.", "author": "Scramjet ", "homepage": "https://github.com/scramjetorg/transform-hub#readme", @@ -39,10 +39,10 @@ "url": "https://github.com/scramjetorg/transform-hub/issues" }, "dependencies": { - "@scramjet/utility": "^0.34.3" + "@scramjet/utility": "^0.34.4" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "ava": "^3.15.0", "typedoc": "^0.23.17", "typedoc-plugin-markdown": "^3.13.6" diff --git a/packages/sth-config/src/image-config.json b/packages/sth-config/src/image-config.json index a9579ec34..b1e26ec38 100644 --- a/packages/sth-config/src/image-config.json +++ b/packages/sth-config/src/image-config.json @@ -1,7 +1,7 @@ { - "prerunner": "scramjetorg/pre-runner:0.34.3", + "prerunner": "scramjetorg/pre-runner:0.34.4", "runner": { - "node": "scramjetorg/runner:0.34.3", - "python3": "scramjetorg/runner-py:0.34.3" + "node": "scramjetorg/runner:0.34.4", + "python3": "scramjetorg/runner-py:0.34.4" } } diff --git a/packages/sth/package.json b/packages/sth/package.json index b35181b71..336f35d8c 100644 --- a/packages/sth/package.json +++ b/packages/sth/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/sth", - "version": "0.34.3", + "version": "0.34.4", "description": "Scramjet Transform Hub is a deployment and execution platform. Once installed on a server, it will allow you to start your programs and keep them running on a remote machine. You will be able to start programs in the background or connect to them and see their output directly on your terminal. You will be able to pipe your local data to the program as if it was running from your terminal. You can start your server in AWS, Google Cloud or Azure, start it on your local machine, install it on a Raspberry Pi or wherever else you'd like.", "main": "src/index.ts", "bin": { @@ -20,15 +20,15 @@ "author": "Scramjet ", "license": "AGPL-3.0", "dependencies": { - "@scramjet/host": "^0.34.3", - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/sth-config": "^0.34.3", - "@scramjet/utility": "^0.34.3", + "@scramjet/host": "^0.34.4", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/sth-config": "^0.34.4", + "@scramjet/utility": "^0.34.4", "commander": "^8.3.0" }, "devDependencies": { - "@scramjet/model": "^0.34.3", - "@scramjet/types": "^0.34.3", + "@scramjet/model": "^0.34.4", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", diff --git a/packages/symbols/package.json b/packages/symbols/package.json index 3b09d8644..fcf67a04e 100644 --- a/packages/symbols/package.json +++ b/packages/symbols/package.json @@ -1,7 +1,7 @@ { "name": "@scramjet/symbols", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package holds the symbols and enumerations for STH.", "main": "./src/index.ts", "scripts": { diff --git a/packages/symbols/src/headers/host.ts b/packages/symbols/src/headers/host.ts new file mode 100644 index 000000000..20a276611 --- /dev/null +++ b/packages/symbols/src/headers/host.ts @@ -0,0 +1,3 @@ +export enum HostHeaders { + SEQUENCE_FORCE_REMOVE = "x-seq-kill-inst" +} diff --git a/packages/symbols/src/headers/index.ts b/packages/symbols/src/headers/index.ts new file mode 100644 index 000000000..d6bfcf360 --- /dev/null +++ b/packages/symbols/src/headers/index.ts @@ -0,0 +1 @@ +export * from "./host"; diff --git a/packages/symbols/src/index.ts b/packages/symbols/src/index.ts index de7e42120..b3a3c261a 100644 --- a/packages/symbols/src/index.ts +++ b/packages/symbols/src/index.ts @@ -8,3 +8,4 @@ export { SequenceMessageCode } from "./sequence-status-code"; export { OpRecordCode } from "./op-record-code"; export { APIErrorCode } from "./api-error-codes"; +export * from "./headers"; diff --git a/packages/symbols/src/op-record-code.ts b/packages/symbols/src/op-record-code.ts index 017332d59..a01657918 100644 --- a/packages/symbols/src/op-record-code.ts +++ b/packages/symbols/src/op-record-code.ts @@ -54,6 +54,13 @@ export enum OpRecordCode { INSTANCE_HEARTBEAT = 13012, MANAGER_HEARTBEAT = 13020, + /** + * Message codes related to STH connection states + * Inticates whether the hub has been connected or disconnected + */ + HUB_CONNECTED = 14000, + HUB_DISCONNECTED = 14001, + /** * The INSTANCE_STOPPED message is sent when an Instance terminated not * in response to the API request but gracefully by itself or by throwing an error. diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 817d14e5b..6e0d24ba0 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/telemetry", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides modules for gathering analytics data.", "author": "Scramjet ", "homepage": "https://github.com/scramjetorg/transform-hub#readme", @@ -32,13 +32,13 @@ "url": "https://github.com/scramjetorg/transform-hub/issues" }, "dependencies": { - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/utility": "^0.34.3", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/utility": "^0.34.4", "winston": "^3.8.2", "winston-loki": "^6.0.6" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "ava": "^3.15.0", "typedoc": "^0.23.17", "typedoc-plugin-markdown": "^3.13.6" diff --git a/packages/types/package.json b/packages/types/package.json index d4ee19953..2c6a54447 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/types", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package holds the typescript definitions for all common STH interfaces.", "main": "./src/index.ts", "scripts": { @@ -14,7 +14,7 @@ "author": "Scramjet ", "license": "AGPL-3.0", "dependencies": { - "@scramjet/symbols": "^0.34.3", + "@scramjet/symbols": "^0.34.4", "http-status-codes": "^2.2.0" }, "devDependencies": { diff --git a/packages/types/src/api-client/host-client.ts b/packages/types/src/api-client/host-client.ts index af9de9824..7287c3f67 100644 --- a/packages/types/src/api-client/host-client.ts +++ b/packages/types/src/api-client/host-client.ts @@ -59,7 +59,7 @@ export declare class HostClient { getLogStream(requestInit?: RequestInit): ReturnType; sendSequence(sequencePackage: Parameters[1], requestInit?: RequestInit, update?: boolean): Promise; getSequence(sequenceId: string): Promise; - deleteSequence(sequenceId: string): Promise; + deleteSequence(sequenceId: string, opts?: { force: boolean }): Promise; getInstanceInfo(instanceId: string): Promise; getLoadCheck(): Promise; getVersion(): Promise; diff --git a/packages/types/src/rest-api-sth/send-delete-sequence.ts b/packages/types/src/rest-api-sth/send-delete-sequence.ts index f53a678cc..7e94f70de 100644 --- a/packages/types/src/rest-api-sth/send-delete-sequence.ts +++ b/packages/types/src/rest-api-sth/send-delete-sequence.ts @@ -1 +1,3 @@ -export type DeleteSequenceResponse = {id: string} +export type DeleteSequenceResponse = { + id: string +} diff --git a/packages/utility/package.json b/packages/utility/package.json index 5c13026bb..5a2a1c0ba 100644 --- a/packages/utility/package.json +++ b/packages/utility/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/utility", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package holds utility functions used in places around Scramjet Transform Hub.", "author": "Scramjet ", "homepage": "https://github.com/scramjetorg/transform-hub#readme", @@ -33,7 +33,7 @@ "url": "https://github.com/scramjetorg/transform-hub/issues" }, "devDependencies": { - "@scramjet/types": "^0.34.3", + "@scramjet/types": "^0.34.4", "ava": "^4.3.3", "typed-emitter": "^1.4.0", "typedoc": "^0.23.17", diff --git a/packages/verser/package.json b/packages/verser/package.json index 240638c67..a9321b56f 100644 --- a/packages/verser/package.json +++ b/packages/verser/package.json @@ -1,6 +1,6 @@ { "name": "@scramjet/verser", - "version": "0.34.3", + "version": "0.34.4", "description": "This package is part of Scramjet Transform Hub. The package provides a reverse server functionality used among Scramjet modules.", "main": "./src/index.ts", "scripts": { @@ -14,13 +14,13 @@ "author": "Scramjet ", "license": "AGPL-3.0", "dependencies": { - "@scramjet/obj-logger": "^0.34.3", - "@scramjet/utility": "^0.34.3", + "@scramjet/obj-logger": "^0.34.4", + "@scramjet/utility": "^0.34.4", "bpmux": "^8.2.1" }, "devDependencies": { - "@scramjet/api-server": "^0.34.3", - "@scramjet/types": "^0.34.3", + "@scramjet/api-server": "^0.34.4", + "@scramjet/types": "^0.34.4", "@types/node": "15.12.5", "ava": "^3.15.0", "ts-node": "^10.9.1", diff --git a/yarn.lock b/yarn.lock index bb4ee0f37..76373a24e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6450,10 +6450,10 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== +semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2: + version "7.5.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.2.tgz#5b851e66d1be07c1cdaf37dfc856f543325a2beb" + integrity sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ== dependencies: lru-cache "^6.0.0"