diff --git a/.github/workflows/infrastructure.yml b/.github/workflows/infrastructure.yml index 91725c86b..6d5774f31 100644 --- a/.github/workflows/infrastructure.yml +++ b/.github/workflows/infrastructure.yml @@ -236,6 +236,7 @@ jobs: stack-name: ${{env.STACK_NAME}} work-dir: ./packages/infrastructure/main env: + HEXHIVE_SECRET: ${{ secrets.HEXHIVE_SECRET }} IOT_USER: ${{ secrets.IOT_USER }} IOT_PASS: ${{ secrets.IOT_PASS }} IOT_EXCHANGE: ${{ secrets.IOT_EXCHANGE }} diff --git a/.gitignore b/.gitignore index 2a2e8f13f..a9621def4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,9 @@ dist/ !.yarn/plugins !.yarn/releases !.yarn/sdks -!.yarn/versions \ No newline at end of file +!.yarn/versions + +*stack + + +*.key \ No newline at end of file diff --git a/.yarn/cache/@hexhive-crypto-npm-1.0.2-beta.82-9570622cd8-891b058d85.zip b/.yarn/cache/@hexhive-crypto-npm-1.0.2-beta.82-9570622cd8-891b058d85.zip new file mode 100644 index 000000000..f51d35abe Binary files /dev/null and b/.yarn/cache/@hexhive-crypto-npm-1.0.2-beta.82-9570622cd8-891b058d85.zip differ diff --git a/.yarn/cache/@hexhive-graphql-server-npm-1.0.2-beta.70-b79fc759b2-7d9f3f212a.zip b/.yarn/cache/@hexhive-graphql-server-npm-1.0.2-beta.82-f95129152f-5169334d6f.zip similarity index 54% rename from .yarn/cache/@hexhive-graphql-server-npm-1.0.2-beta.70-b79fc759b2-7d9f3f212a.zip rename to .yarn/cache/@hexhive-graphql-server-npm-1.0.2-beta.82-f95129152f-5169334d6f.zip index 61fdc161a..87bb9ab14 100644 Binary files a/.yarn/cache/@hexhive-graphql-server-npm-1.0.2-beta.70-b79fc759b2-7d9f3f212a.zip and b/.yarn/cache/@hexhive-graphql-server-npm-1.0.2-beta.82-f95129152f-5169334d6f.zip differ diff --git a/.yarn/cache/dotenv-npm-15.0.1-bf1659b577-acebaa5b0b.zip b/.yarn/cache/dotenv-npm-15.0.1-bf1659b577-acebaa5b0b.zip new file mode 100644 index 000000000..d64bcc772 Binary files /dev/null and b/.yarn/cache/dotenv-npm-15.0.1-bf1659b577-acebaa5b0b.zip differ diff --git a/.yarn/cache/graphql-http-npm-1.22.1-a6bc7f8c03-b514ed1783.zip b/.yarn/cache/graphql-http-npm-1.22.1-a6bc7f8c03-b514ed1783.zip new file mode 100644 index 000000000..990a60e62 Binary files /dev/null and b/.yarn/cache/graphql-http-npm-1.22.1-a6bc7f8c03-b514ed1783.zip differ diff --git a/.yarn/cache/node-rsa-npm-1.1.1-ff58d35e03-c03a6c8f69.zip b/.yarn/cache/node-rsa-npm-1.1.1-ff58d35e03-c03a6c8f69.zip new file mode 100644 index 000000000..a154b536f Binary files /dev/null and b/.yarn/cache/node-rsa-npm-1.1.1-ff58d35e03-c03a6c8f69.zip differ diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b463945f..7058de1c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommandClient/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hivecomand-clients/root + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommandClient/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hivecomand-clients/root + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommandClient/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hivecomand-clients/root + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommandClient/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hivecomand-clients/root + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommandClient/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hivecomand-clients/root diff --git a/README.md b/README.md index 6a279915a..8e2697409 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,14 @@ SCADA system for IIOT 4.0 -- [Electrical Editor](packages/core-ui/command-electrical-editor/README.md) - ## Getting Started -Developer pathway +### Developer pathway Get dependencies + +[HexHive Gateway](https://github.com/TheTechCompany/HexHive) + ``` git clone @@ -17,23 +18,17 @@ cd HiveCommand/ yarn ``` -Start Storybook (Component development) +Start gateway, backend + web-frontend ``` -cd packages/core-ui/command-electrical-editor +hexhive-dev -yarn storybook -``` - - -Start backend + web-frontend (HexHive gateway needs configuring first) [HexHive Gateway](https://github.com/TheTechCompany/HexHive) -``` cd packages/app/hivecommand-backend/; yarn start cd packages/app/hivecommand-frontend/; yarn start ``` -## Typescript references +#### Typescript references To keep typescript inference throughout the monorepo follow the below steps; Keep the root tsconfig.json up to date with project references @@ -43,13 +38,38 @@ Add references at the bottom of modules that use shared modules For webpack ts-loader with projectReferences and tsconfig-paths-webpack-plugin must be setup -Integrator pathway +### Integrator pathway + +[Device onboarding](/docs/device-onboarding.md) + +Architecture + +``` +┌─────────────────────┐ +│EdgeDevice (RPi / PC)│ +└┬────────────────────┘ +┌▽────────────────┐ +│SCADA Client │ +└┬───────────────┬┘ +┌▽─────────────┐┌▽─────────────┐ +│Evented values││PLC Driver Bus│ +└┬─────────────┘└┬─────────────┘ +┌▽───┐┌──────────▽┐ +│MQTT││PLC │ +└────┘└───────────┘ +``` + +Available SCADA Clients + +- [@hive-command/cli-client](/packages/clients/cli-client/) +- [@hive-command/native](https://github.com/TheTechCompany/HiveCommand/releases) -[Download Builder](https://github.com/TheTechCompany/HiveCommand/releases) +Available PLC Drivers -End-user pathway +- [Driver interface](/packages/drivers/command-driver/) +- [OPC-UA](/packages/drivers/command-opcua/) +- [Ethernet/IP](/packages/drivers/command-ethernet-ip/) -[Sign Up](https://hivecommand.dev) ## Testing diff --git a/docs/device-onboarding.md b/docs/device-onboarding.md new file mode 100644 index 000000000..7c8dac35d --- /dev/null +++ b/docs/device-onboarding.md @@ -0,0 +1,32 @@ +# Device onboarding + +Prerequisites + +- [IO Mapping](./program-io.md) + +## Stages + +1. Device creation +2. Token setup +3. Provisioning +4. Runtime setup + +### Device Creation + +In the deployments menu click the add button, provide a site level name describing where this device will be, customise the ID if required and select the Program from the dropdown. + +### Token Setup + +Click the more button and select settings for the device you are trying to setup. + +Click the add button and provide a name for the token you are trying to generate, click next and a token will be generated for this installation. + +### Provisioning + +Install the required client library for your installation, for a headless installation the [CLI Client](https://npmjs.com/@hive-command/cli-client) is probably the right choice, for a manned installation the [Native App](https://github.com/TheTechCompany/HiveCommand/releases) is a better choice. + +Start the client and provide the provisoning code, after fetching the required context from the discovery server and installing the drivers data transmission should begin. + +### Runtime setup + +Power outages, maintenance and other things can cause the client to crash so it's a good idea to either set it up as a Windows service or run with a watchdog like forever diff --git a/docs/getting-started.md b/docs/getting-started.md index 8b3a7945c..31dd91e80 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -1 +1,2 @@ -# Getting Started \ No newline at end of file +# Getting Started + diff --git a/docs/images/data-scopes-config.png b/docs/images/data-scopes-config.png new file mode 100644 index 000000000..b9c8ff159 Binary files /dev/null and b/docs/images/data-scopes-config.png differ diff --git a/docs/images/data-scopes-modal.png b/docs/images/data-scopes-modal.png new file mode 100644 index 000000000..37abab84f Binary files /dev/null and b/docs/images/data-scopes-modal.png differ diff --git a/docs/images/data-scopes.png b/docs/images/data-scopes.png new file mode 100644 index 000000000..43bb580fe Binary files /dev/null and b/docs/images/data-scopes.png differ diff --git a/docs/images/tag-datatypes.png b/docs/images/tag-datatypes.png new file mode 100644 index 000000000..2376502ff Binary files /dev/null and b/docs/images/tag-datatypes.png differ diff --git a/docs/images/tag-scope.png b/docs/images/tag-scope.png new file mode 100644 index 000000000..07812ab05 Binary files /dev/null and b/docs/images/tag-scope.png differ diff --git a/docs/program-io.md b/docs/program-io.md new file mode 100644 index 000000000..dd73b5d86 --- /dev/null +++ b/docs/program-io.md @@ -0,0 +1,43 @@ +# Program IO + +Communication is maintained by a series of driver libraries [(found here)](/packages/drivers/) each one is responsible for a single protocol and when instantiated is responsible for a long term connection to a single instance of the opposing server/client. + +Values are included in a program through Tags and Types, Tags are top level mappings of name, datatype and location (which driver instance). Tags datatypes are basic primitives (string, number, boolean) and Types. + +Types are re-usable mappings of tags that allow for mapping logical types e.g. Valves and Pumps. + +## Driver setup + +To setup a new driver in a program go to the System page in the program editor and click the add button + +![Image](./images/data-scopes.png) + +Select the driver type from the dropdown in the modal + +![Image](./images/data-scopes-modal.png) + +Finally configure the driver options to match the local configuration + +![Image](./images/data-scopes-config.png) + +## Tag setup + +Tags are mapped to the local values by the drivers and each may implement this differently. + +For Ethernet/IP the tags are fetched only from the global tag list and are batched in to small workloads fetched cyclicly + +For OPC-UA the tags are fetched with a prefix applied from the driver configuration and are batched in to smaller workloads based on the OPC-UA serverside configuration. + +Multiple different drivers can be combined through the tag list to make a new HMI top level tag list + +To add new tags select Tags from the Editor menu. + +Drivers can be configured from the driver dropdown on each tag row + +![Image](./images/tag-scope.png) + +Datatypes can be configured from the type dropdown + +![Image](./images/tag-datatypes.png) + +Changes are saved automatically as items are changed \ No newline at end of file diff --git a/lerna.json b/lerna.json index 2de89ba98..1efb04e81 100644 --- a/lerna.json +++ b/lerna.json @@ -13,5 +13,5 @@ "packages/types/*" ], "npmClient": "yarn", - "version": "1.4.15-alpha.309" + "version": "1.4.15-alpha.313" } diff --git a/packages/app/hivecommand-api/CHANGELOG.md b/packages/app/hivecommand-api/CHANGELOG.md index ce579a9bc..46a72f35c 100644 --- a/packages/app/hivecommand-api/CHANGELOG.md +++ b/packages/app/hivecommand-api/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/api + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/api + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/api + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/api + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/api diff --git a/packages/app/hivecommand-api/package.json b/packages/app/hivecommand-api/package.json index 75d42a5e8..681308ab8 100644 --- a/packages/app/hivecommand-api/package.json +++ b/packages/app/hivecommand-api/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/api", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "private": true, diff --git a/packages/app/hivecommand-api/src/device/analytics/index.ts b/packages/app/hivecommand-api/src/device/analytics/index.ts index 9aa25f2f3..2b4a26879 100644 --- a/packages/app/hivecommand-api/src/device/analytics/index.ts +++ b/packages/app/hivecommand-api/src/device/analytics/index.ts @@ -96,7 +96,9 @@ export const useAddDeviceChart = (deviceId: string) => { y: number, w: number, h: number, - total?: boolean + total?: boolean, + xAxisDomain?: any, + yAxisDomain?: any }) => { const item = mutation.createCommandDeviceAnalytic({ page: args.page, @@ -111,7 +113,9 @@ export const useAddDeviceChart = (deviceId: string) => { tagId: args.templateId, subkeyId: args.keyId, timeBucket: args.timeBucket, - device: deviceId + device: deviceId, + xAxisDomain: args.xAxisDomain, + yAxisDomain: args.yAxisDomain } }) @@ -121,7 +125,7 @@ export const useAddDeviceChart = (deviceId: string) => { } } }) - return (page: string, type: string, templateId: string, keyId: string, unit: string, timeBucket: string, x: number, y: number, w: number, h: number, total?: boolean) => { + return (page: string, type: string, templateId: string, keyId: string, unit: string, timeBucket: string, x: number, y: number, w: number, h: number, total?: boolean, xAxisDomain?: any, yAxisDomain?: any) => { return addGraph({ args: { page: page, @@ -134,7 +138,9 @@ export const useAddDeviceChart = (deviceId: string) => { w, h, total, - timeBucket + timeBucket, + xAxisDomain, + yAxisDomain } }) } @@ -153,7 +159,9 @@ export const useUpdateDeviceChart = (deviceId: string) => { y: number, w: number, h: number, - total?: boolean + total?: boolean, + xAxisDomain?: any, + yAxisDomain?: any }) => { const item = mutation.updateCommandDeviceAnalytic({ id: args.id, @@ -168,7 +176,9 @@ export const useUpdateDeviceChart = (deviceId: string) => { unit: args.unit, timeBucket: args.timeBucket, tagId: args.templateId, - subkeyId: args.keyId + subkeyId: args.keyId, + xAxisDomain: args.xAxisDomain, + yAxisDomain: args.yAxisDomain } }) @@ -178,7 +188,8 @@ export const useUpdateDeviceChart = (deviceId: string) => { } } }) - return (page: string, id: string, type: string, templateId: string, keyId: string, unit: string, timeBucket: string, x: number, y: number, w: number, h: number, total?: boolean) => { + return (page: string, id: string, type: string, templateId: string, keyId: string, unit: string, timeBucket: string, x: number, y: number, w: number, h: number, total?: boolean, xAxisDomain?: any, yAxisDomain?: any) => { + console.log({xAxisDomain, yAxisDomain}) return addGraph({ args: { page, @@ -192,7 +203,9 @@ export const useUpdateDeviceChart = (deviceId: string) => { y, w, h, - total + total, + xAxisDomain, + yAxisDomain } }) } diff --git a/packages/app/hivecommand-api/src/gqty/schema.generated.ts b/packages/app/hivecommand-api/src/gqty/schema.generated.ts index 36bc6f82f..ce6cef1d5 100644 --- a/packages/app/hivecommand-api/src/gqty/schema.generated.ts +++ b/packages/app/hivecommand-api/src/gqty/schema.generated.ts @@ -2,8 +2,6 @@ * GQTY AUTO-GENERATED CODE: PLEASE DO NOT MODIFY MANUALLY */ -import { SchemaUnionsKey } from "gqty"; - export type Maybe = T | null; export type InputMaybe = Maybe; export type Exact = { @@ -43,13 +41,6 @@ export interface ComandProgramInterfaceEdgeInput { toPoint?: InputMaybe; } -export interface ComandProgramInterfaceGroupInput { - nodes?: InputMaybe>>; - ports?: InputMaybe>>; - x?: InputMaybe; - y?: InputMaybe; -} - export interface ComandProgramInterfaceNodeInput { children?: InputMaybe>>; height?: InputMaybe; @@ -95,7 +86,9 @@ export interface CommandDeviceAnalyticInput { unit?: InputMaybe; width?: InputMaybe; x?: InputMaybe; + xAxisDomain?: InputMaybe; y?: InputMaybe; + yAxisDomain?: InputMaybe; } export interface CommandDeviceInput { @@ -333,12 +326,6 @@ export const generatedSchema = { toHandle: { __type: "String" }, toPoint: { __type: "JSON" }, }, - ComandProgramInterfaceGroupInput: { - nodes: { __type: "[ComandProgramInterfaceNodeInput]" }, - ports: { __type: "[CommandHMIPortInput]" }, - x: { __type: "Float" }, - y: { __type: "Float" }, - }, ComandProgramInterfaceNodeInput: { children: { __type: "[ComandProgramInterfaceNodeInput]" }, height: { __type: "Float" }, @@ -423,6 +410,7 @@ export const generatedSchema = { }, CommandDeviceAnalytic: { __typename: { __type: "String!" }, + createdAt: { __type: "DateTime" }, device: { __type: "CommandDevice" }, height: { __type: "Int" }, id: { __type: "ID!" }, @@ -438,11 +426,13 @@ export const generatedSchema = { unit: { __type: "String" }, values: { __type: "[CommandDeviceTimeseriesData]", - __args: { endDate: "DateTime", format: "String", startDate: "DateTime" }, + __args: { endDate: "DateTime", startDate: "DateTime" }, }, width: { __type: "Int" }, x: { __type: "Int" }, + xAxisDomain: { __type: "JSON" }, y: { __type: "Int" }, + yAxisDomain: { __type: "JSON" }, }, CommandDeviceAnalyticInput: { device: { __type: "String" }, @@ -456,7 +446,9 @@ export const generatedSchema = { unit: { __type: "String" }, width: { __type: "Int" }, x: { __type: "Int" }, + xAxisDomain: { __type: "JSON" }, y: { __type: "Int" }, + yAxisDomain: { __type: "JSON" }, }, CommandDeviceInput: { deviceSnapshot: { __type: "[CommandDeviceSnapshotInput]" }, @@ -466,9 +458,12 @@ export const generatedSchema = { }, CommandDeviceReport: { __typename: { __type: "String!" }, + createdAt: { __type: "DateTime" }, device: { __type: "CommandDevice" }, + endDate: { __type: "DateTime" }, fields: { __type: "[CommandDeviceReportField]" }, id: { __type: "ID!" }, + instances: { __type: "[CommandDeviceReportInstance]" }, name: { __type: "String" }, recurring: { __type: "Boolean" }, reportLength: { __type: "String" }, @@ -477,6 +472,7 @@ export const generatedSchema = { CommandDeviceReportField: { __typename: { __type: "String!" }, bucket: { __type: "String" }, + createdAt: { __type: "DateTime" }, device: { __type: "CommandProgramTag" }, id: { __type: "ID!" }, key: { __type: "CommandProgramTypeField" }, @@ -493,6 +489,18 @@ export const generatedSchema = { reportLength: { __type: "String" }, startDate: { __type: "DateTime" }, }, + CommandDeviceReportInstance: { + __typename: { __type: "String!" }, + createdAt: { __type: "DateTime" }, + done: { __type: "Boolean" }, + endDate: { __type: "DateTime" }, + fileId: { __type: "String" }, + id: { __type: "ID" }, + report: { __type: "CommandDeviceReport" }, + startDate: { __type: "DateTime" }, + url: { __type: "String" }, + version: { __type: "String" }, + }, CommandDeviceScreen: { __typename: { __type: "String!" }, createdAt: { __type: "DateTime" }, @@ -598,19 +606,6 @@ export const generatedSchema = { toHandle: { __type: "String" }, toPoint: { __type: "JSON" }, }, - CommandHMIGroup: { - __typename: { __type: "String!" }, - height: { __type: "Float" }, - id: { __type: "ID!" }, - inputs: { __type: "[CommandHMINode]" }, - nodes: { __type: "[CommandHMINode]" }, - outputs: { __type: "[CommandHMINode]" }, - ports: { __type: "[CommandHMIPort]" }, - rotation: { __type: "Float" }, - width: { __type: "Float" }, - x: { __type: "Float" }, - y: { __type: "Float" }, - }, CommandHMINode: { __typename: { __type: "String!" }, children: { __type: "[CommandHMINode]" }, @@ -638,10 +633,6 @@ export const generatedSchema = { sourceHandle: { __type: "String" }, targetHandle: { __type: "String" }, }, - CommandHMINodes: { - __typename: { __type: "String!" }, - $on: { __type: "$CommandHMINodes!" }, - }, CommandHMIPort: { __typename: { __type: "String!" }, id: { __type: "ID!" }, @@ -704,6 +695,7 @@ export const generatedSchema = { CommandProgramAlarmPathway: { __typename: { __type: "String!" }, compileError: { __type: "Boolean" }, + createdAt: { __type: "DateTime" }, id: { __type: "ID" }, name: { __type: "String" }, scope: { __type: "String" }, @@ -834,7 +826,10 @@ export const generatedSchema = { organisation: { __type: "HiveOrganisation" }, pages: { __type: "[CommandSchematicPage]" }, templates: { __type: "[CommandSchematicPageTemplate]" }, - versions: { __type: "[CommandSchematicVersion]" }, + versions: { + __type: "[CommandSchematicVersion]", + __args: { where: "CommandSchematicWhere" }, + }, }, CommandSchematicInput: { name: { __type: "String" }, @@ -868,6 +863,7 @@ export const generatedSchema = { CommandSchematicVersion: { __typename: { __type: "String!" }, commit: { __type: "String" }, + compiled: { __type: "Boolean" }, createdAt: { __type: "DateTime" }, createdBy: { __type: "HiveUser" }, data: { __type: "JSON" }, @@ -907,6 +903,7 @@ export const generatedSchema = { inputs: { __type: "[CommandTemplateIO]" }, name: { __type: "String" }, outputs: { __type: "[CommandTemplateIO]" }, + systemOptions: { __type: "JSON" }, }, CommandTemplateTransformerInput: { name: { __type: "String" } }, ConnectDevicesInput: { @@ -1057,14 +1054,6 @@ export const generatedSchema = { program: "ID", }, }, - createCommandProgramInterfaceGroup: { - __type: "CommandHMIGroup", - __args: { - input: "ComandProgramInterfaceGroupInput!", - node: "ID", - program: "ID", - }, - }, createCommandProgramInterfaceNode: { __type: "CommandHMINode", __args: { @@ -1182,10 +1171,6 @@ export const generatedSchema = { __type: "CommandHMIEdge", __args: { hmi: "ID", id: "ID!", program: "ID" }, }, - deleteCommandProgramInterfaceGroup: { - __type: "CommandHMIGroup", - __args: { id: "ID!", node: "ID", program: "ID" }, - }, deleteCommandProgramInterfaceNode: { __type: "CommandHMINode", __args: { hmi: "ID", id: "ID!", program: "ID" }, @@ -1227,6 +1212,16 @@ export const generatedSchema = { __type: "CommandDeviceScreen", __args: { device: "ID", id: "ID!" }, }, + downloadCommandDeviceAnalytic: { + __type: "String", + __args: { + bucket: "String", + endDate: "DateTime", + id: "ID", + page: "ID", + startDate: "DateTime", + }, + }, exportCommandSchematic: { __type: "String", __args: { id: "ID!" } }, importCommandProgramTags: { __type: "[CommandProgramTag]", @@ -1366,15 +1361,6 @@ export const generatedSchema = { program: "ID", }, }, - updateCommandProgramInterfaceGroup: { - __type: "CommandHMIGroup", - __args: { - id: "ID", - input: "ComandProgramInterfaceGroupInput!", - node: "ID", - program: "ID", - }, - }, updateCommandProgramInterfaceNode: { __type: "CommandHMINode", __args: { @@ -1441,6 +1427,10 @@ export const generatedSchema = { __type: "CommandTemplateIO", __args: { id: "ID!", input: "CommandTemplateIOInput!", template: "ID!" }, }, + updateCommandTemplateSystemEdge: { + __type: "Boolean", + __args: { key: "String", script: "String", template: "ID!" }, + }, updateDeviceScreen: { __type: "CommandDeviceScreen", __args: { device: "ID", id: "ID!", input: "DeviceScreenInput!" }, @@ -1474,7 +1464,6 @@ export const generatedSchema = { __typename: { __type: "String!" }, watchingDevice: { __type: "[HiveUser]", __args: { device: "ID!" } }, }, - [SchemaUnionsKey]: { CommandHMINodes: ["CommandHMIGroup", "CommandHMINode"] }, } as const; export interface CommandAnalyticPage { @@ -1539,6 +1528,7 @@ export interface CommandDevice { export interface CommandDeviceAnalytic { __typename?: "CommandDeviceAnalytic"; + createdAt?: Maybe; device?: Maybe; height?: Maybe; id: ScalarsEnums["ID"]; @@ -1554,19 +1544,23 @@ export interface CommandDeviceAnalytic { unit?: Maybe; values: (args?: { endDate?: Maybe; - format?: Maybe; startDate?: Maybe; }) => Maybe>>; width?: Maybe; x?: Maybe; + xAxisDomain?: Maybe; y?: Maybe; + yAxisDomain?: Maybe; } export interface CommandDeviceReport { __typename?: "CommandDeviceReport"; + createdAt?: Maybe; device?: Maybe; + endDate?: Maybe; fields?: Maybe>>; id: ScalarsEnums["ID"]; + instances?: Maybe>>; name?: Maybe; recurring?: Maybe; reportLength?: Maybe; @@ -1576,11 +1570,25 @@ export interface CommandDeviceReport { export interface CommandDeviceReportField { __typename?: "CommandDeviceReportField"; bucket?: Maybe; + createdAt?: Maybe; device?: Maybe; id: ScalarsEnums["ID"]; key?: Maybe; } +export interface CommandDeviceReportInstance { + __typename?: "CommandDeviceReportInstance"; + createdAt?: Maybe; + done?: Maybe; + endDate?: Maybe; + fileId?: Maybe; + id?: Maybe; + report?: Maybe; + startDate?: Maybe; + url?: Maybe; + version?: Maybe; +} + export interface CommandDeviceScreen { __typename?: "CommandDeviceScreen"; createdAt?: Maybe; @@ -1662,20 +1670,6 @@ export interface CommandHMIEdge { toPoint?: Maybe; } -export interface CommandHMIGroup { - __typename?: "CommandHMIGroup"; - height?: Maybe; - id: ScalarsEnums["ID"]; - inputs?: Maybe>>; - nodes?: Maybe>>; - outputs?: Maybe>>; - ports?: Maybe>>; - rotation?: Maybe; - width?: Maybe; - x?: Maybe; - y?: Maybe; -} - export interface CommandHMINode { __typename?: "CommandHMINode"; children?: Maybe>>; @@ -1705,11 +1699,6 @@ export interface CommandHMINodeFlow { targetHandle?: Maybe; } -export interface CommandHMINodes { - __typename?: "CommandHMIGroup" | "CommandHMINode"; - $on: $CommandHMINodes; -} - export interface CommandHMIPort { __typename?: "CommandHMIPort"; id: ScalarsEnums["ID"]; @@ -1763,6 +1752,7 @@ export interface CommandProgramAlarm { export interface CommandProgramAlarmPathway { __typename?: "CommandProgramAlarmPathway"; compileError?: Maybe; + createdAt?: Maybe; id?: Maybe; name?: Maybe; scope?: Maybe; @@ -1847,7 +1837,9 @@ export interface CommandSchematic { organisation?: Maybe; pages?: Maybe>>; templates?: Maybe>>; - versions?: Maybe>>; + versions: (args?: { + where?: Maybe; + }) => Maybe>>; } export interface CommandSchematicPage { @@ -1870,6 +1862,7 @@ export interface CommandSchematicPageTemplate { export interface CommandSchematicVersion { __typename?: "CommandSchematicVersion"; commit?: Maybe; + compiled?: Maybe; createdAt?: Maybe; createdBy?: Maybe; data?: Maybe; @@ -1900,6 +1893,7 @@ export interface CommandTemplateTransformer { inputs?: Maybe>>; name?: Maybe; outputs?: Maybe>>; + systemOptions?: Maybe; } export interface DeviceAlarm { @@ -2027,11 +2021,6 @@ export interface Mutation { input: ComandProgramInterfaceEdgeInput; program?: Maybe; }) => Maybe; - createCommandProgramInterfaceGroup: (args: { - input: ComandProgramInterfaceGroupInput; - node?: Maybe; - program?: Maybe; - }) => Maybe; createCommandProgramInterfaceNode: (args: { hmi?: Maybe; input: ComandProgramInterfaceNodeInput; @@ -2146,11 +2135,6 @@ export interface Mutation { id: Scalars["ID"]; program?: Maybe; }) => Maybe; - deleteCommandProgramInterfaceGroup: (args: { - id: Scalars["ID"]; - node?: Maybe; - program?: Maybe; - }) => Maybe; deleteCommandProgramInterfaceNode: (args: { hmi?: Maybe; id: Scalars["ID"]; @@ -2195,6 +2179,13 @@ export interface Mutation { device?: Maybe; id: Scalars["ID"]; }) => Maybe; + downloadCommandDeviceAnalytic: (args?: { + bucket?: Maybe; + endDate?: Maybe; + id?: Maybe; + page?: Maybe; + startDate?: Maybe; + }) => Maybe; exportCommandSchematic: (args: { id: Scalars["ID"]; }) => Maybe; @@ -2309,12 +2300,6 @@ export interface Mutation { input: ComandProgramInterfaceEdgeInput; program?: Maybe; }) => Maybe; - updateCommandProgramInterfaceGroup: (args: { - id?: Maybe; - input: ComandProgramInterfaceGroupInput; - node?: Maybe; - program?: Maybe; - }) => Maybe; updateCommandProgramInterfaceNode: (args: { hmi?: Maybe; id?: Maybe; @@ -2371,6 +2356,11 @@ export interface Mutation { input: CommandTemplateIOInput; template: Scalars["ID"]; }) => Maybe; + updateCommandTemplateSystemEdge: (args: { + key?: Maybe; + script?: Maybe; + template: Scalars["ID"]; + }) => Maybe; updateDeviceScreen: (args: { device?: Maybe; id: Scalars["ID"]; @@ -2416,6 +2406,7 @@ export interface SchemaObjectTypes { CommandDeviceAnalytic: CommandDeviceAnalytic; CommandDeviceReport: CommandDeviceReport; CommandDeviceReportField: CommandDeviceReportField; + CommandDeviceReportInstance: CommandDeviceReportInstance; CommandDeviceScreen: CommandDeviceScreen; CommandDeviceSnapshot: CommandDeviceSnapshot; CommandDeviceTimeseriesData: CommandDeviceTimeseriesData; @@ -2425,7 +2416,6 @@ export interface SchemaObjectTypes { CommandHMIDevicePack: CommandHMIDevicePack; CommandHMIDevicePort: CommandHMIDevicePort; CommandHMIEdge: CommandHMIEdge; - CommandHMIGroup: CommandHMIGroup; CommandHMINode: CommandHMINode; CommandHMINodeFlow: CommandHMINodeFlow; CommandHMIPort: CommandHMIPort; @@ -2467,6 +2457,7 @@ export type SchemaObjectTypesNames = | "CommandDeviceAnalytic" | "CommandDeviceReport" | "CommandDeviceReportField" + | "CommandDeviceReportInstance" | "CommandDeviceScreen" | "CommandDeviceSnapshot" | "CommandDeviceTimeseriesData" @@ -2476,7 +2467,6 @@ export type SchemaObjectTypesNames = | "CommandHMIDevicePack" | "CommandHMIDevicePort" | "CommandHMIEdge" - | "CommandHMIGroup" | "CommandHMINode" | "CommandHMINodeFlow" | "CommandHMIPort" @@ -2509,11 +2499,6 @@ export type SchemaObjectTypesNames = | "Query" | "Subscription"; -export interface $CommandHMINodes { - CommandHMIGroup?: CommandHMIGroup; - CommandHMINode?: CommandHMINode; -} - export interface GeneratedSchema { query: Query; mutation: Mutation; diff --git a/packages/app/hivecommand-backend/CHANGELOG.md b/packages/app/hivecommand-backend/CHANGELOG.md index a172ae5cb..3884fd08c 100644 --- a/packages/app/hivecommand-backend/CHANGELOG.md +++ b/packages/app/hivecommand-backend/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/backend + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/backend + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/backend + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/backend + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/backend diff --git a/packages/app/hivecommand-backend/package.json b/packages/app/hivecommand-backend/package.json index e6f8b2588..d7029f699 100644 --- a/packages/app/hivecommand-backend/package.json +++ b/packages/app/hivecommand-backend/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/backend", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "index.js", "private": true, @@ -38,16 +38,16 @@ "@aws-sdk/s3-request-presigner": "^3.554.0", "@casl/ability": "^6.5.0", "@graphql-tools/merge": "^9.0.0", - "@hexhive/graphql-server": "1.0.2-beta.70", - "@hive-command/amqp-client": "^1.4.15-alpha.309", - "@hive-command/data": "^1.4.15-alpha.309", - "@hive-command/scripting": "^1.4.15-alpha.289", + "@hexhive/graphql-server": "1.0.2-beta.82", + "@hive-command/amqp-client": "^1.4.15-alpha.313", + "@hive-command/data": "^1.4.15-alpha.313", + "@hive-command/scripting": "^1.4.15-alpha.313", "@prisma/client": "^3.12.0", "amqplib": "^0.8.0", "axios": "^0.27.2", "cors": "^2.8.5", "csv": "^6.3.8", - "dotenv": "^10.0.0", + "dotenv": "^15.0.0", "express": "^4.17.2", "express-graphql": "^0.12.0", "graphql": "15.x", diff --git a/packages/app/hivecommand-backend/src/index.ts b/packages/app/hivecommand-backend/src/index.ts index a0638c76b..905c6b591 100644 --- a/packages/app/hivecommand-backend/src/index.ts +++ b/packages/app/hivecommand-backend/src/index.ts @@ -37,9 +37,16 @@ const prisma = new PrismaClient(); const { typeDefs, resolvers } = schema(prisma, deviceMQ); + console.log(process.env.HEXHIVE_SECRET) const graphServer = new HiveGraph({ dev: false, + + name: 'HiveCommand', + backend_url: process.env.BACKEND_ENTRYPOINT || 'http://localhost:9010/graphql', + entrypoint: process.env.ENTRYPOINT || 'http://localhost:8504/hivecommand-app-frontend.js', rootServer: process.env.ROOT_SERVER || 'http://localhost:7000', + slug: 'command', + schema: { typeDefs: typeDefs, resolvers: resolvers, diff --git a/packages/app/hivecommand-backend/src/schema/devices/analytics.ts b/packages/app/hivecommand-backend/src/schema/devices/analytics.ts index 4dd9bf616..e65d776e3 100644 --- a/packages/app/hivecommand-backend/src/schema/devices/analytics.ts +++ b/packages/app/hivecommand-backend/src/schema/devices/analytics.ts @@ -59,6 +59,9 @@ export default (prisma: PrismaClient) => { unit: String timeBucket: String + xAxisDomain: JSON + yAxisDomain: JSON + device: String } @@ -83,6 +86,9 @@ export default (prisma: PrismaClient) => { device: CommandDevice + xAxisDomain: JSON + yAxisDomain: JSON + createdAt: DateTime } @@ -366,6 +372,9 @@ export default (prisma: PrismaClient) => { width: args.input.width, height: args.input.height, + xAxisDomain: args.input.xAxisDomain, + yAxisDomain: args.input.yAxisDomain, + tag: { connect: {id: args.input.tagId} }, @@ -396,6 +405,9 @@ export default (prisma: PrismaClient) => { width: args.input.width, height: args.input.height, + xAxisDomain: args.input.xAxisDomain, + yAxisDomain: args.input.yAxisDomain, + tag: { connect: {id: args.input.tagId} }, diff --git a/packages/app/hivecommand-backend/src/schema/devices/index.ts b/packages/app/hivecommand-backend/src/schema/devices/index.ts index 03632d993..ca826e7c0 100644 --- a/packages/app/hivecommand-backend/src/schema/devices/index.ts +++ b/packages/app/hivecommand-backend/src/schema/devices/index.ts @@ -55,7 +55,9 @@ export default (prisma: PrismaClient) => { include: { device: true } - } + }, + // xAxisDomain: true, + // yAxisDomain: true } }, device: true diff --git a/packages/app/hivecommand-backend/src/schema/program/alarms/index.ts b/packages/app/hivecommand-backend/src/schema/program/alarms/index.ts index 281409b13..be624fdf9 100644 --- a/packages/app/hivecommand-backend/src/schema/program/alarms/index.ts +++ b/packages/app/hivecommand-backend/src/schema/program/alarms/index.ts @@ -5,6 +5,7 @@ import { LexoRank } from "lexorank"; import { JsxEmit, ModuleKind, ScriptTarget, transpile } from 'typescript'; import { Project } from 'ts-morph' import { defaultAlarm, defaultAlarmPathway } from "./defaults"; +import { FnTranspileOptions } from "@hive-command/scripting"; const canCompile = (tsCode: string) => { @@ -134,7 +135,7 @@ export default (prisma: PrismaClient) => { let compiled; try{ - compiled = transpile(args.input.script, {module: ModuleKind.CommonJS, target: ScriptTarget.ES5}) + compiled = transpile(args.input.script, FnTranspileOptions) }catch(err){ } @@ -181,7 +182,7 @@ export default (prisma: PrismaClient) => { let compiled; try{ - compiled = transpile(args.input.script, {module: ModuleKind.CommonJS, target: ScriptTarget.ES5}) + compiled = transpile(args.input.script, FnTranspileOptions) }catch(err){ } diff --git a/packages/app/hivecommand-db/CHANGELOG.md b/packages/app/hivecommand-db/CHANGELOG.md index df48aa7ad..4e8321085 100644 --- a/packages/app/hivecommand-db/CHANGELOG.md +++ b/packages/app/hivecommand-db/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/data + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/data + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/data + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/data + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/data diff --git a/packages/app/hivecommand-db/package.json b/packages/app/hivecommand-db/package.json index 44a23b46e..3ac0af695 100644 --- a/packages/app/hivecommand-db/package.json +++ b/packages/app/hivecommand-db/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/data", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "private": true, @@ -21,6 +21,7 @@ "license": "ISC", "devDependencies": { "prisma": "^5.0.0", + "ts-node": "^10.9.2", "typescript": "4.9.5" }, "dependencies": { diff --git a/packages/app/hivecommand-db/prisma/migrations/20240911222727_add_xy_domain/migration.sql b/packages/app/hivecommand-db/prisma/migrations/20240911222727_add_xy_domain/migration.sql new file mode 100644 index 000000000..0403df172 --- /dev/null +++ b/packages/app/hivecommand-db/prisma/migrations/20240911222727_add_xy_domain/migration.sql @@ -0,0 +1,3 @@ +-- AlterTable +ALTER TABLE "AnalyticPageChart" ADD COLUMN "xAxisDomain" JSONB, +ADD COLUMN "yAxisDomain" JSONB; diff --git a/packages/app/hivecommand-db/prisma/schema.prisma b/packages/app/hivecommand-db/prisma/schema.prisma index 555a56f72..8b8112c7b 100644 --- a/packages/app/hivecommand-db/prisma/schema.prisma +++ b/packages/app/hivecommand-db/prisma/schema.prisma @@ -223,6 +223,9 @@ model AnalyticPageChart { timeBucket String? + xAxisDomain Json? + yAxisDomain Json? + page AnalyticPage @relation(name: "hasAnalyticChart", fields: [pageId], references: [id], onDelete: Cascade) pageId String } diff --git a/packages/app/hivecommand-frontend/CHANGELOG.md b/packages/app/hivecommand-frontend/CHANGELOG.md index fdb1ccb92..e77d33ace 100644 --- a/packages/app/hivecommand-frontend/CHANGELOG.md +++ b/packages/app/hivecommand-frontend/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/frontend + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/frontend + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/frontend + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/frontend + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/frontend diff --git a/packages/app/hivecommand-frontend/package.json b/packages/app/hivecommand-frontend/package.json index b6acea4d1..f6a2fd0e6 100644 --- a/packages/app/hivecommand-frontend/package.json +++ b/packages/app/hivecommand-frontend/package.json @@ -1,7 +1,7 @@ { "name": "@hive-command/frontend", "private": true, - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "scripts": { "start": "webpack serve --port 8504", "start:standalone": "webpack serve --env standalone", @@ -69,16 +69,16 @@ "@hexhive/auth-ui": "1.0.2-beta.44", "@hexhive/styles": "1.0.1-alpha.84", "@hexhive/ui": "1.0.1-alpha.119", - "@hive-command/api": "^1.4.15-alpha.309", - "@hive-command/canvas-nodes": "^1.4.15-alpha.309", - "@hive-command/command-surface": "^1.4.15-alpha.309", + "@hive-command/api": "^1.4.15-alpha.313", + "@hive-command/canvas-nodes": "^1.4.15-alpha.313", + "@hive-command/command-surface": "^1.4.15-alpha.313", "@hive-command/data-types": "^1.4.15-alpha.52", "@hive-command/electrical-editor": "^1.4.15-alpha.289", "@hive-command/electrical-editor-v2": "workspace:^", "@hive-command/interface-editor": "workspace:^", "@hive-command/interface-types": "workspace:^", "@hive-command/remote-components": "^1.4.15-alpha.289", - "@hive-command/scripting": "^1.4.15-alpha.289", + "@hive-command/scripting": "^1.4.15-alpha.313", "@monaco-editor/react": "^4.4.6", "@mui/base": "5.0.0-beta.40", "@mui/icons-material": "^5.6.2", diff --git a/packages/app/hivecommand-frontend/src/components/modals/screen-provision/index.tsx b/packages/app/hivecommand-frontend/src/components/modals/screen-provision/index.tsx index 0ad078d73..11ef517cf 100644 --- a/packages/app/hivecommand-frontend/src/components/modals/screen-provision/index.tsx +++ b/packages/app/hivecommand-frontend/src/components/modals/screen-provision/index.tsx @@ -48,11 +48,11 @@ export const ScreenProvisionModal = (props) => { onChange={(e) => updateScreenData('name', e.target.value)} size="small" fullWidth - label="Screen name" /> + label="Token name" /> } /> @@ -69,7 +69,7 @@ export const ScreenProvisionModal = (props) => { }}, {id: 'provisioning', label: "Provision", view: ( - + {/* Provisioning... */} ), beforeNext: async () => { @@ -81,7 +81,7 @@ export const ScreenProvisionModal = (props) => { }}, {id: 'finished', label: "Finish", view: ( - Screen Provisioned successfully + Token created successfully )} ] @@ -118,14 +118,14 @@ export const ScreenProvisionModal = (props) => { open={props.open} onClose={props.onClose}> - Provision screen + Create token {renderStep()} - + {screenData.id && } diff --git a/packages/app/hivecommand-frontend/src/hivecommand-app-frontend.tsx b/packages/app/hivecommand-frontend/src/hivecommand-app-frontend.tsx index 61ba185bd..3125e04ba 100644 --- a/packages/app/hivecommand-frontend/src/hivecommand-app-frontend.tsx +++ b/packages/app/hivecommand-frontend/src/hivecommand-app-frontend.tsx @@ -8,7 +8,7 @@ const lifecycles = singleSpaReact({ React, ReactDOM, rootComponent: () => ( - + ), errorBoundary(err, info, props) { diff --git a/packages/app/hivecommand-frontend/src/pages/device-control/utils/analytics.ts b/packages/app/hivecommand-frontend/src/pages/device-control/utils/analytics.ts index f60087e23..199c14ed4 100644 --- a/packages/app/hivecommand-frontend/src/pages/device-control/utils/analytics.ts +++ b/packages/app/hivecommand-frontend/src/pages/device-control/utils/analytics.ts @@ -36,6 +36,9 @@ export const useDeviceAnalytics = (id: string) => { unit timeBucket + + xAxisDomain + yAxisDomain } diff --git a/packages/app/hivecommand-frontend/src/pages/device-settings/index.tsx b/packages/app/hivecommand-frontend/src/pages/device-settings/index.tsx index 3527a0574..ce76ac8a1 100644 --- a/packages/app/hivecommand-frontend/src/pages/device-settings/index.tsx +++ b/packages/app/hivecommand-frontend/src/pages/device-settings/index.tsx @@ -68,7 +68,7 @@ export const DeviceSettings = () => { - Screens + Tokens openProvisioner(true)} size="small"> diff --git a/packages/app/hivecommand-frontend/src/pages/element-editor/views/preview.tsx b/packages/app/hivecommand-frontend/src/pages/element-editor/views/preview.tsx index 90b449f6c..9918023ef 100644 --- a/packages/app/hivecommand-frontend/src/pages/element-editor/views/preview.tsx +++ b/packages/app/hivecommand-frontend/src/pages/element-editor/views/preview.tsx @@ -1,3 +1,4 @@ +import React from 'react'; import { InfiniteCanvas } from "@hexhive/ui" import { useContext } from "react"; import { HMINodeFactory } from "@hive-command/canvas-nodes"; @@ -34,7 +35,7 @@ export const PreviewView = () => { // devicePlaceholder: x.devicePlaceholder, iconString: editDevice?.name, icon: editDevice.Component //HMIIcons[editDevice?.name], - }, + } } ] as any} style={CanvasStyle} /> diff --git a/packages/app/hivecommand-frontend/src/views/Editor/pages/components/views/preview.tsx b/packages/app/hivecommand-frontend/src/views/Editor/pages/components/views/preview.tsx index 4473a7ca5..22d2b7df4 100644 --- a/packages/app/hivecommand-frontend/src/views/Editor/pages/components/views/preview.tsx +++ b/packages/app/hivecommand-frontend/src/views/Editor/pages/components/views/preview.tsx @@ -3,6 +3,7 @@ import React, { useEffect, useMemo, useRef } from 'react'; import { transpile, ModuleKind, JsxEmit, ScriptTarget } from 'typescript'; import { ErrorBoundary, useErrorBoundary } from 'react-error-boundary' import path from 'path'; +import { FnTranspileOptions } from '@hive-command/scripting'; const PreviewComponent = (props: any) => { const { mainId, files } = props; @@ -93,7 +94,7 @@ const Loader = (files: { id: string, path: string, content: string }[], mainId: if(file?.content){ // const data = await fetch(url) - const stringFunc = transpile(file?.content, { kind: ModuleKind.CommonJS, jsx: JsxEmit.React, target: ScriptTarget.ES5 }) + const stringFunc = transpile(file?.content, FnTranspileOptions) console.log(stringFunc, files, mainId) diff --git a/packages/app/hivecommand-frontend/src/views/Editor/pages/template/index.tsx b/packages/app/hivecommand-frontend/src/views/Editor/pages/template/index.tsx index cb9480425..dd15913d5 100644 --- a/packages/app/hivecommand-frontend/src/views/Editor/pages/template/index.tsx +++ b/packages/app/hivecommand-frontend/src/views/Editor/pages/template/index.tsx @@ -20,13 +20,13 @@ export const getter = (inputs: Inputs) : ( { left: string, top: string, - content: any + content: () => any } | null ) => { return { left: '', top: '', - content: ( + content: () => ( <> ) diff --git a/packages/clients/cli-client/CHANGELOG.md b/packages/clients/cli-client/CHANGELOG.md index 1210d8963..0c631f661 100644 --- a/packages/clients/cli-client/CHANGELOG.md +++ b/packages/clients/cli-client/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/cli-client + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/cli-client + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/cli-client + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/cli-client + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/cli-client diff --git a/packages/clients/cli-client/README.md b/packages/clients/cli-client/README.md new file mode 100644 index 000000000..81e6ab94d --- /dev/null +++ b/packages/clients/cli-client/README.md @@ -0,0 +1,15 @@ +# HiveCommand CLI Client + +CLI access to the HiveCommand client which is responsible for SCADA integrations in the HiveCommand ecosystem + +## Setup + +- Get an access token from your HiveCommand dashboard +- Install @hive-command/cli-client + +## Arguments + +| Argument | Type | Description | +| -------- | ---- | ----------- | +| --discoveryServer | URL | Discovery server to point SCADA data at (default: http://discovery.hexhive.io) | +| --provisionCode | String | Provision code to authenticate with | \ No newline at end of file diff --git a/packages/clients/cli-client/package.json b/packages/clients/cli-client/package.json index 44c2a87e4..ae6ce5491 100644 --- a/packages/clients/cli-client/package.json +++ b/packages/clients/cli-client/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/cli-client", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "files": [ "dist/" @@ -22,7 +22,7 @@ }, "dependencies": { "@hive-command/discovery-api-types": "workspace:^", - "@hive-command/scada": "^1.4.15-alpha.309", + "@hive-command/scada": "^1.4.15-alpha.313", "axios": "^1.3.3", "loglevel": "^1.8.1", "yargs": "^17.7.2" diff --git a/packages/clients/native-app-client/CHANGELOG.md b/packages/clients/native-app-client/CHANGELOG.md index 3dd7f9f8b..cd44cc652 100644 --- a/packages/clients/native-app-client/CHANGELOG.md +++ b/packages/clients/native-app-client/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/native + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/native + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/native + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/native + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/native diff --git a/packages/clients/native-app-client/README.md b/packages/clients/native-app-client/README.md index b87cb0044..2559e9531 100644 --- a/packages/clients/native-app-client/README.md +++ b/packages/clients/native-app-client/README.md @@ -1,46 +1,12 @@ -# Getting Started with Create React App +# HiveCommand native-app-client -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). +The native app for HiveCommand HMIs on local machines -## Available Scripts +## Get start -In the project directory, you can run: +```yarn start``` -### `npm start` -Runs the app in the development mode.\ -Open [http://localhost:3000](http://localhost:3000) to view it in the browser. +## Dependencies -The page will reload if you make edits.\ -You will also see any lint errors in the console. - -### `npm test` - -Launches the test runner in the interactive watch mode.\ -See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `npm run build` - -Builds the app for production to the `build` folder.\ -It correctly bundles React in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.\ -Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### `npm run eject` - -**Note: this is a one-way operation. Once you `eject`, you can’t go back!** - -If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. - -Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. - -You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. - -## Learn More - -You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). - -To learn React, check out the [React documentation](https://reactjs.org/). +sidecar-client \ No newline at end of file diff --git a/packages/clients/native-app-client/package.json b/packages/clients/native-app-client/package.json index 51483550e..3ba28e0de 100644 --- a/packages/clients/native-app-client/package.json +++ b/packages/clients/native-app-client/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/native", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "private": true, "sideEffects": false, "dependencies": { @@ -9,12 +9,12 @@ "@hexhive/styles": "^1.0.1-alpha.77", "@hexhive/ui": "1.0.1-alpha.119", "@hexhive/utils": "^0.0.6-alpha.13", - "@hive-command/api": "^1.4.15-alpha.309", - "@hive-command/command-surface": "^1.4.15-alpha.309", + "@hive-command/api": "^1.4.15-alpha.313", + "@hive-command/command-surface": "^1.4.15-alpha.313", "@hive-command/discovery-api-types": "workspace:^", "@hive-command/remote-components": "^1.4.15-alpha.289", - "@hive-command/scripting": "^1.4.15-alpha.289", - "@hive-command/sidecar-client": "^1.4.15-alpha.309", + "@hive-command/scripting": "^1.4.15-alpha.313", + "@hive-command/sidecar-client": "^1.4.15-alpha.313", "@monaco-editor/react": "4.6.0", "@mui/icons-material": "^5.11.16", "@mui/lab": "5.0.0-alpha.170", diff --git a/packages/clients/native-app-client/src/views/controller/client.tsx b/packages/clients/native-app-client/src/views/controller/client.tsx index b0702feaf..2da8965bf 100644 --- a/packages/clients/native-app-client/src/views/controller/client.tsx +++ b/packages/clients/native-app-client/src/views/controller/client.tsx @@ -269,7 +269,7 @@ export const useLocalClient = (devices: any[]): CommandSurfaceClient => { setReportPages(reports) }, - addChart: async (pageId, type, deviceId, keyId, units, x, y, w, h, totalize) => { + addChart: async (pageId, type, deviceId, keyId, units, x, y, w, h, totalize, xAxisDomain: any, yAxisDomain: any) => { let reports = reportPages.slice(); let ix = reports.map((x) => x.id).indexOf(pageId) if (ix > -1) { @@ -284,6 +284,8 @@ export const useLocalClient = (devices: any[]): CommandSurfaceClient => { y, w, h, + xAxisDomain, + yAxisDomain, dataDevice: { name: `${dev.type?.tagPrefix ? dev.type?.tagPrefix + '.' : ''}${dev.tag}` }, diff --git a/packages/clients/sidecar-client/CHANGELOG.md b/packages/clients/sidecar-client/CHANGELOG.md index 063cd6abe..9dfb3a858 100644 --- a/packages/clients/sidecar-client/CHANGELOG.md +++ b/packages/clients/sidecar-client/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/sidecar-client + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/sidecar-client + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/sidecar-client + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/sidecar-client + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/sidecar-client diff --git a/packages/clients/sidecar-client/README.md b/packages/clients/sidecar-client/README.md new file mode 100644 index 000000000..c560a004f --- /dev/null +++ b/packages/clients/sidecar-client/README.md @@ -0,0 +1,5 @@ +# HiveCommand Sidecar Client + +Sidecar client for HiveCommand which is responsible for SCADA integrations in the HiveCommand ecosystem. + +This is meant for direct inclusion with the native-app-client (Tauri sidecar) do not use independently unless making a native app diff --git a/packages/clients/sidecar-client/package.json b/packages/clients/sidecar-client/package.json index 8e53fc7a4..37981c2fd 100644 --- a/packages/clients/sidecar-client/package.json +++ b/packages/clients/sidecar-client/package.json @@ -1,10 +1,8 @@ { "name": "@hive-command/sidecar-client", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "main": "dist/index.js", - "publishConfig": { - "access": "public" - }, + "private": true, "license": "MIT", "bin": "dist/index.js", "files": [ @@ -25,9 +23,9 @@ "tsconfig-paths": "^4.1.1" }, "dependencies": { - "@hive-command/amqp-client": "^1.4.15-alpha.309", - "@hive-command/drivers-base": "^1.4.15-alpha.309", - "@hive-command/evented-values": "^1.4.15-alpha.309", + "@hive-command/amqp-client": "^1.4.15-alpha.313", + "@hive-command/drivers-base": "^1.4.15-alpha.313", + "@hive-command/evented-values": "^1.4.15-alpha.313", "@hive-command/scada": "workspace:^", "@hive-command/threads": "^1.7.0", "@yarnpkg/cli": "^4.0.0-rc.44", diff --git a/packages/clients/sidecar-client/src/index.ts b/packages/clients/sidecar-client/src/index.ts index 8d0c167eb..a8e4be38f 100644 --- a/packages/clients/sidecar-client/src/index.ts +++ b/packages/clients/sidecar-client/src/index.ts @@ -15,7 +15,6 @@ import { ScadaCommand } from '@hive-command/scada'; const OPC_PROXY_PORT = 8484; - (async () => { const scada = new ScadaCommand(); diff --git a/packages/communication/amqp-client/CHANGELOG.md b/packages/communication/amqp-client/CHANGELOG.md index 051905574..8046e3325 100644 --- a/packages/communication/amqp-client/CHANGELOG.md +++ b/packages/communication/amqp-client/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/amqp-client + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/amqp-client + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/amqp-client + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/amqp-client + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/amqp-client diff --git a/packages/communication/amqp-client/package.json b/packages/communication/amqp-client/package.json index 3d30b4526..0524a0058 100644 --- a/packages/communication/amqp-client/package.json +++ b/packages/communication/amqp-client/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/amqp-client", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "publishConfig": { diff --git a/packages/communication/amqp-hub/CHANGELOG.md b/packages/communication/amqp-hub/CHANGELOG.md index eba977cd4..84b9f3d8f 100644 --- a/packages/communication/amqp-hub/CHANGELOG.md +++ b/packages/communication/amqp-hub/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/amqp-hub + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/amqp-hub + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/amqp-hub + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/amqp-hub + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/amqp-hub diff --git a/packages/communication/amqp-hub/package.json b/packages/communication/amqp-hub/package.json index 63ce8dc13..84b74e953 100644 --- a/packages/communication/amqp-hub/package.json +++ b/packages/communication/amqp-hub/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/amqp-hub", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "files": [ @@ -14,7 +14,7 @@ "test": "jest" }, "devDependencies": { - "@hive-command/data": "^1.4.15-alpha.309", + "@hive-command/data": "^1.4.15-alpha.313", "@types/amqplib": "^0.10.1", "dotenv": "^16.0.3", "jest": "27.x", @@ -22,7 +22,7 @@ "typescript": "4.9.5" }, "dependencies": { - "@hive-command/amqp-client": "^1.4.15-alpha.309", + "@hive-command/amqp-client": "^1.4.15-alpha.313", "amqplib": "^0.10.3" }, "author": "", diff --git a/packages/communication/opc-amqp-bridge/CHANGELOG.md b/packages/communication/opc-amqp-bridge/CHANGELOG.md index 0027317fc..292bb845f 100644 --- a/packages/communication/opc-amqp-bridge/CHANGELOG.md +++ b/packages/communication/opc-amqp-bridge/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/opcua-amqp-bridge + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/opcua-amqp-bridge + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/opcua-amqp-bridge + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/opcua-amqp-bridge + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/opcua-amqp-bridge diff --git a/packages/communication/opc-amqp-bridge/package.json b/packages/communication/opc-amqp-bridge/package.json index 8e1d6e292..8d72e9ba7 100644 --- a/packages/communication/opc-amqp-bridge/package.json +++ b/packages/communication/opc-amqp-bridge/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/opcua-amqp-bridge", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "files": [ @@ -20,9 +20,9 @@ "typescript": "4.9.5" }, "dependencies": { - "@hive-command/amqp-client": "^1.4.15-alpha.309", - "@hive-command/opcua-client": "^1.4.15-alpha.309", - "@hive-command/scripting": "^1.4.15-alpha.289", + "@hive-command/amqp-client": "^1.4.15-alpha.313", + "@hive-command/opcua-client": "^1.4.15-alpha.313", + "@hive-command/scripting": "^1.4.15-alpha.313", "lodash": "^4.17.21", "loglevel": "^1.8.1", "node-opcua": "2.116.0", diff --git a/packages/communication/opc-amqp-bridge/src/runner/index.ts b/packages/communication/opc-amqp-bridge/src/runner/index.ts index b81120ee5..faea57cc9 100644 --- a/packages/communication/opc-amqp-bridge/src/runner/index.ts +++ b/packages/communication/opc-amqp-bridge/src/runner/index.ts @@ -1,4 +1,4 @@ -import { load_exports, parseValue } from "@hive-command/scripting"; +import { FnTranspileOptions, load_exports, parseValue } from "@hive-command/scripting"; import { DataType } from "node-opcua"; import {transpile, ModuleKind} from 'typescript'; import { OPCMQTTClient, SidecarOptions } from ".."; @@ -33,7 +33,7 @@ export class Runner { let tagValue = deviceMap.tag; if (tagValue?.indexOf('script://') == 0) { - const jsCode = transpile(tagValue?.match(/script:\/\/([.\s\S]+)/)?.[1] || '', { module: ModuleKind.CommonJS }) + const jsCode = transpile(tagValue?.match(/script:\/\/([.\s\S]+)/)?.[1] || '', FnTranspileOptions) const { getter, setter } = load_exports(jsCode) return {path: deviceMap.path, fn: (valueStructure: any) => getter(valueStructure)}; @@ -81,7 +81,7 @@ export class Runner { if (tag?.indexOf('script://') == 0) { - const jsCode = transpile(tag?.match(/script:\/\/([.\s\S]+)/)?.[1] || '', { module: ModuleKind.CommonJS }) + const jsCode = transpile(tag?.match(/script:\/\/([.\s\S]+)/)?.[1] || '', FnTranspileOptions) const { getter, setter } = load_exports(jsCode) await new Promise((resolve, reject) => { diff --git a/packages/communication/opc-client/CHANGELOG.md b/packages/communication/opc-client/CHANGELOG.md index 47e8d9aa8..a3243ac16 100644 --- a/packages/communication/opc-client/CHANGELOG.md +++ b/packages/communication/opc-client/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/sudbuster/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/opcua-client + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/sudbuster/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/opcua-client + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/sudbuster/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/opcua-client + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/sudbuster/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/opcua-client + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/sudbuster/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/opcua-client diff --git a/packages/communication/opc-client/example/index.ts b/packages/communication/opc-client/example/index.ts index 747eace40..57bad12b7 100644 --- a/packages/communication/opc-client/example/index.ts +++ b/packages/communication/opc-client/example/index.ts @@ -13,8 +13,10 @@ const client = new OPCClient(); await client.connect("opc.tcp://localhost:4840"); - const type =await client.getType(`/Objects/0:Server/4:AC500 PM56xx-2ETH/3:Resources/4:Application/3:GlobalVars/4:GVL/4:STSP_NF_Permeate`); - console.log(type) //DataType[type]); + const results = await client.getDetails(`/Objects/0:Server/4:AC500 PM56xx-2ETH/3:Resources/4:Application/3:GlobalVars/4:GVL/4:FT501/4:Flow`) + + // const type =await client.getType(`/Objects/0:Server/4:AC500 PM56xx-2ETH/3:Resources/4:Application/3:GlobalVars/4:GVL/4:FT501`); + console.log(results) //DataType[type]); // await client.setDetails(`/Objects/1:A`, DataType.Boolean, true); diff --git a/packages/communication/opc-client/package.json b/packages/communication/opc-client/package.json index 2416e87c5..243549b36 100644 --- a/packages/communication/opc-client/package.json +++ b/packages/communication/opc-client/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/opcua-client", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "> TODO: description", "author": "Ross Leitch ", "homepage": "https://github.com/TheTechCompany/sudbuster#readme", @@ -32,7 +32,7 @@ "node-opcua": "2.116.0" }, "devDependencies": { - "@hive-command/opcua-server": "^1.4.15-alpha.309", + "@hive-command/opcua-server": "^1.4.15-alpha.313", "@sinonjs/fake-timers": "^10.0.2", "@types/jest": "^27.0.3", "@types/sinon": "^10.0.13", @@ -40,7 +40,7 @@ "jest": "^26.6.3", "sinon": "^15.0.1", "ts-jest": "^26.5.6", - "ts-node": "^9.1.1", + "ts-node": "10", "typescript": "4.9.5" }, "gitHead": "6b372375734c1503bb29dc43a07da77eab814dae" diff --git a/packages/communication/opc-client/src/index.ts b/packages/communication/opc-client/src/index.ts index be531762a..830679a43 100644 --- a/packages/communication/opc-client/src/index.ts +++ b/packages/communication/opc-client/src/index.ts @@ -58,8 +58,6 @@ export default class Client { constructor(discoveryServer?: string){ // super(); - - console.log("Construct") this.client = OPCUAClient.create({ endpointMustExist: false, // discoveryUrl: discoveryServer, diff --git a/packages/communication/opc-ethernet-ip-bridge/CHANGELOG.md b/packages/communication/opc-ethernet-ip-bridge/CHANGELOG.md index 2df116304..e5dd1c9be 100644 --- a/packages/communication/opc-ethernet-ip-bridge/CHANGELOG.md +++ b/packages/communication/opc-ethernet-ip-bridge/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/enip-bridge + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/enip-bridge + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/enip-bridge + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/enip-bridge + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/enip-bridge diff --git a/packages/communication/opc-ethernet-ip-bridge/package.json b/packages/communication/opc-ethernet-ip-bridge/package.json index f2b1dc2e9..70fdd2985 100644 --- a/packages/communication/opc-ethernet-ip-bridge/package.json +++ b/packages/communication/opc-ethernet-ip-bridge/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/enip-bridge", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "publishConfig": { @@ -26,7 +26,7 @@ }, "dependencies": { "@hive-command/ethernet-ip": "^2.5.6-alpha.31", - "@hive-command/opcua-server": "^1.4.15-alpha.309", + "@hive-command/opcua-server": "^1.4.15-alpha.313", "express": "^4.18.2" } } diff --git a/packages/communication/opc-server/CHANGELOG.md b/packages/communication/opc-server/CHANGELOG.md index a7ce0ca6c..5aa93dd82 100644 --- a/packages/communication/opc-server/CHANGELOG.md +++ b/packages/communication/opc-server/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/sudbuster/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/opcua-server + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/sudbuster/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/opcua-server + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/sudbuster/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/opcua-server + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/sudbuster/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/opcua-server + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/sudbuster/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/opcua-server diff --git a/packages/communication/opc-server/package.json b/packages/communication/opc-server/package.json index 9a669472d..cbd3a222a 100644 --- a/packages/communication/opc-server/package.json +++ b/packages/communication/opc-server/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/opcua-server", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "> TODO: description", "author": "Ross Leitch ", "homepage": "https://github.com/TheTechCompany/sudbuster#readme", @@ -30,7 +30,7 @@ "node-opcua": "2.116.0" }, "devDependencies": { - "@hive-command/opcua-client": "^1.4.15-alpha.309", + "@hive-command/opcua-client": "^1.4.15-alpha.313", "@types/jest": "^27.0.3", "jest": "^26.6.3", "ts-jest": "^26.5.6", diff --git a/packages/core-ui/command-canvas-nodes/CHANGELOG.md b/packages/core-ui/command-canvas-nodes/CHANGELOG.md index 86ab56dd9..7a540be71 100644 --- a/packages/core-ui/command-canvas-nodes/CHANGELOG.md +++ b/packages/core-ui/command-canvas-nodes/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/canvas-nodes + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/canvas-nodes + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/canvas-nodes + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/canvas-nodes + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/canvas-nodes diff --git a/packages/core-ui/command-canvas-nodes/package.json b/packages/core-ui/command-canvas-nodes/package.json index 65ddacedc..c8d922b06 100644 --- a/packages/core-ui/command-canvas-nodes/package.json +++ b/packages/core-ui/command-canvas-nodes/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/canvas-nodes", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "main": "dist/index.js", "publishConfig": { "access": "public" diff --git a/packages/core-ui/command-export-page/CHANGELOG.md b/packages/core-ui/command-export-page/CHANGELOG.md index c32eb59e0..c6fd93fac 100644 --- a/packages/core-ui/command-export-page/CHANGELOG.md +++ b/packages/core-ui/command-export-page/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/export-page + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/export-page + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/export-page + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/export-page + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/export-page diff --git a/packages/core-ui/command-export-page/package.json b/packages/core-ui/command-export-page/package.json index 80c6848a6..e629f005a 100644 --- a/packages/core-ui/command-export-page/package.json +++ b/packages/core-ui/command-export-page/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/export-page", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "private": true, "main": "build/index.html", "files": [ diff --git a/packages/core-ui/command-schematic-viewer/CHANGELOG.md b/packages/core-ui/command-schematic-viewer/CHANGELOG.md index cb625b4cd..d3fb9a4a2 100644 --- a/packages/core-ui/command-schematic-viewer/CHANGELOG.md +++ b/packages/core-ui/command-schematic-viewer/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/schematic-viewer + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/schematic-viewer + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/schematic-viewer + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/schematic-viewer + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/schematic-viewer diff --git a/packages/core-ui/command-schematic-viewer/package.json b/packages/core-ui/command-schematic-viewer/package.json index a42677e59..2529b9c19 100644 --- a/packages/core-ui/command-schematic-viewer/package.json +++ b/packages/core-ui/command-schematic-viewer/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/schematic-viewer", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "private": true, diff --git a/packages/core-ui/command-surface/CHANGELOG.md b/packages/core-ui/command-surface/CHANGELOG.md index e868f90eb..d530a02f3 100644 --- a/packages/core-ui/command-surface/CHANGELOG.md +++ b/packages/core-ui/command-surface/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/command-surface + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/command-surface + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/command-surface + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/command-surface + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/command-surface diff --git a/packages/core-ui/command-surface/package.json b/packages/core-ui/command-surface/package.json index 599afbbc9..be9644df8 100644 --- a/packages/core-ui/command-surface/package.json +++ b/packages/core-ui/command-surface/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/command-surface", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "private": true, "publishConfig": { @@ -54,10 +54,10 @@ }, "dependencies": { "@babel/core": "^7.22.5", - "@hive-command/canvas-nodes": "^1.4.15-alpha.309", + "@hive-command/canvas-nodes": "^1.4.15-alpha.313", "@hive-command/interface-types": "workspace:^", "@hive-command/remote-components": "^1.4.15-alpha.289", - "@hive-command/scripting": "^1.4.15-alpha.289", + "@hive-command/scripting": "^1.4.15-alpha.313", "@mui/system": "^5.13.6", "@mui/x-tree-view": "^6.17.0", "dot": "^1.1.3", diff --git a/packages/core-ui/command-surface/src/components/graph/index.tsx b/packages/core-ui/command-surface/src/components/graph/index.tsx index 065a16973..e2112aea4 100644 --- a/packages/core-ui/command-surface/src/components/graph/index.tsx +++ b/packages/core-ui/command-surface/src/components/graph/index.tsx @@ -19,18 +19,43 @@ export interface BaseGraphProps { xKey?: string; yKey?: string; + + xAxisDomain?: any; + yAxisDomain?: any; } const BaseGraph: React.FC = (props) => { + const xAxisDomain = props.xAxisDomain?.map((domain) => { + try{ + let val = parseFloat(domain) + if(isNaN(val)) return domain; + return val; + }catch(e){ + return domain; + } + }) + + const yAxisDomain = props.yAxisDomain?.map((domain) => { + try{ + let val = parseFloat(domain) + if(isNaN(val)) return domain; + return val; + }catch(e){ + return domain; + } + }) + + console.log({xAxisDomain, yAxisDomain}) + return ( ({...x, [props.yKey || '']: typeof(x?.[props.yKey || '']) === "number" ? x?.[props.yKey || ''] : parseFloat(x?.[props.yKey || ''])}))} > - - + + { const exports : {getter?: (inputs: any) => void, setter?: () => void }= {}; const module = { exports }; - const func = new Function("module", "exports", transpile(templateOverride, { module: ModuleKind.CommonJS }) ); + const func = new Function("module", "exports", transpile(templateOverride, FnTranspileOptions) ); func(module, exports); return { key: optionKey, value: exports.getter?.({device: {on: true}}) } @@ -89,7 +90,7 @@ export const getNodeValues = (node: HMINode) : {[key: string]: any }=> { //Is function const exports : { handler?: () => void }= {}; const module = { exports }; - const func = new Function("module", "exports", transpile(optionValue.fn, {kind: ModuleKind.CommonJS}) ); + const func = new Function("module", "exports", transpile(optionValue.fn, FnTranspileOptions) ); func(module, exports); return { key: optionKey, value: exports?.handler?.() }; diff --git a/packages/core-ui/command-surface/src/components/modals/device-analytic/index.tsx b/packages/core-ui/command-surface/src/components/modals/device-analytic/index.tsx index 03ca501c5..8f5ab0032 100644 --- a/packages/core-ui/command-surface/src/components/modals/device-analytic/index.tsx +++ b/packages/core-ui/command-surface/src/components/modals/device-analytic/index.tsx @@ -25,7 +25,7 @@ export const DeviceAnalyticModal = (props: { fullWidth open={props.open} onClose={props.onClose}> - {props.selected ? "Update": "Create"} Report + {props.selected ? "Update": "Create"} Chart void, onSubmit?: (graph: any) => void}) => { + const [graph, setGraph] = useState<{ unit?: string; deviceID?: string; keyID?: string; totalize?: boolean; timeBucket?: string; + xAxisDomain?: [string, string], + yAxisDomain?: [string, string], }>({}); + const customAxis = graph.xAxisDomain != undefined && graph.yAxisDomain != undefined useEffect(() => { setGraph({ @@ -114,6 +118,54 @@ export const ControlGraphModal = (props: {tags: HMITag[], types: HMIType[], sele onChange={(e) => setGraph({ ...graph, timeBucket: e.target.value })} /> setGraph({...graph, totalize: e.target.checked})} />} /> + + + + { + if(checked){ + setGraph({...graph, xAxisDomain: ['0', 'auto'], yAxisDomain: ['0', 'auto']}) + }else{ + setGraph({...graph, xAxisDomain: undefined, yAxisDomain: undefined}) + } + }}/>} /> + + {customAxis ? ( + + + + setGraph({...graph, xAxisDomain: [ e.target.value, graph.xAxisDomain?.[1] || ''] })} + value={graph.xAxisDomain?.[0] || ''} + label={"X Start"} /> + setGraph({...graph, xAxisDomain: [ graph.xAxisDomain?.[0] || '', e.target.value ] })} + value={graph.xAxisDomain?.[1] || ''} + label={"X End"} /> + + + setGraph({...graph, yAxisDomain: [ e.target.value, graph.yAxisDomain?.[1] || ''] })} + value={graph.yAxisDomain?.[0] || ''} + label={"Y Start"} /> + setGraph({...graph, yAxisDomain: [ graph.yAxisDomain?.[0] || '', e.target.value ] })} + value={graph.yAxisDomain?.[1] || ''} + label={"Y End"} /> + + + ) : null} diff --git a/packages/core-ui/command-surface/src/index.tsx b/packages/core-ui/command-surface/src/index.tsx index 269d1d531..0a736ed5d 100644 --- a/packages/core-ui/command-surface/src/index.tsx +++ b/packages/core-ui/command-surface/src/index.tsx @@ -74,8 +74,37 @@ export interface CommandSurfaceClient { useAnalyticValues?: (report: string, horizon: { start: Date, end: Date }) => ({ results: any, loading: boolean }); - addChart?: (pageId: string, type: string, deviceId: string, keyId: string, units: string, timeBucket: string, x: number, y: number, w: number, h: number, totalize: boolean) => Promise; - updateChart?: (pageId: string, id: string, type: string, deviceId: string, keyId: string, units: string, timeBucket: string, x: number, y: number, w: number, h: number, totalize: boolean) => Promise; + addChart?: ( + pageId: string, + type: string, + deviceId: string, + keyId: string, + units: string, + timeBucket: string, + x: number, + y: number, + w: number, + h: number, + totalize: boolean, + xAxisDomain?: any, + yAxisDomain?: any + ) => Promise; + updateChart?: ( + pageId: string, + id: string, + type: string, + deviceId: string, + keyId: string, + units: string, + timeBucket: string, + x: number, + y: number, + w: number, + h: number, + totalize: boolean, + xAxisDomain?: any, + yAxisDomain?: any + ) => Promise; updateChartGrid?: (pageId: string, layout: { id: string, x: number, y: number, w: number, h: number }[]) => Promise; removeChart?: (pageId: string, id: string) => Promise; @@ -680,8 +709,8 @@ export const CommandSurface: React.FC = (props) => { } const memoisedHmi = useMemo(() => { - return activeProgram?.interface?.map(mapHMI); - }, [activeProgram?.interface]) + return activeProgram?.interface?.map(mapHMI)?.sort((a,b) => a.name?.localeCompare(b.name)); + }, [activeProgram?.interface]); const drawerMenu: (TreeMenuItem & { pathRoot: string, component?: JSX.Element })[] = [ { diff --git a/packages/core-ui/command-surface/src/utils.tsx b/packages/core-ui/command-surface/src/utils.tsx index 4606963b7..ee6a4366f 100644 --- a/packages/core-ui/command-surface/src/utils.tsx +++ b/packages/core-ui/command-surface/src/utils.tsx @@ -6,6 +6,7 @@ import { template } from 'dot'; // import { baseRequirements } from '@hive-command/remote-components'; import { isEqual } from 'lodash'; import path from 'path'; +import { FnTranspileOptions } from '@hive-command/scripting'; export interface DevicePlaceholder { tag: string, @@ -75,7 +76,7 @@ const _require = (components: any[], parent?: string) => { const module = { exports }; - const jsCode = transpile(content, { module: ModuleKind.CommonJS, esModuleInterop: true, jsx: JsxEmit.React }) + const jsCode = transpile(content, FnTranspileOptions) const func = new Function( "module", @@ -96,7 +97,7 @@ const _require = (components: any[], parent?: string) => { const module = { exports }; - const jsCode = transpile(fileObj.content, { module: ModuleKind.CommonJS, jsx: JsxEmit.React, esModuleInterop: true }); + const jsCode = transpile(fileObj.content, FnTranspileOptions); const func = new Function( @@ -338,11 +339,7 @@ export const getSystemValues = ( "exports", "React", "require", - transpile(systemScripts[scriptKey], { - module: ModuleKind.CommonJS, - target: ScriptTarget.ES5, - jsx: JsxEmit.React - }) + transpile(systemScripts[scriptKey], FnTranspileOptions) ); func(module, exports, baseRequirements['react'], _require([]) ); @@ -416,7 +413,7 @@ export const getOptionValues = ( "showTagWindow", "React", "require", - transpile(templateOverride, { module: ModuleKind.CommonJS, target: ScriptTarget.ES5, jsx: JsxEmit.React })); + transpile(templateOverride, FnTranspileOptions)); func(module, exports, (elem, data) => { return functions.showWindow(elem, (state: any) => { @@ -504,7 +501,7 @@ export const getOptionValues = ( "showTagWindow", "React", "require", - transpile(optionValue.replace('script://', ''), { module: ModuleKind.CommonJS, target: ScriptTarget.ES5, jsx: JsxEmit.React })); + transpile(optionValue.replace('script://', ''), FnTranspileOptions)); diff --git a/packages/core-ui/command-surface/src/views/analytics.tsx b/packages/core-ui/command-surface/src/views/analytics.tsx index ec6a6583b..647bfb950 100644 --- a/packages/core-ui/command-surface/src/views/analytics.tsx +++ b/packages/core-ui/command-surface/src/views/analytics.tsx @@ -45,6 +45,9 @@ export interface ReportChart { totalValue: { total: any }; values: { timestamp: any, value: any }[]; + xAxisDomain?: any; + yAxisDomain?: any; + unit: string; } @@ -348,8 +351,8 @@ export const AnalyticView: React.FC = (props) => { if (!activePage) return; if (!graph.id) { - console.log("Add chart") - client?.addChart?.(activePage, 'line-chart', graph.deviceID, graph.keyID, graph.unit, graph.timeBucket, 0, 0, 8, 6, graph.totalize).then(() => { + console.log("Add chart", graph) + client?.addChart?.(activePage, 'line-chart', graph.deviceID, graph.keyID, graph.unit, graph.timeBucket, 0, 0, 8, 6, graph.totalize, graph.xAxisDomain, graph.yAxisDomain).then(() => { openModal(false); console.log("Chart added"); // refetchStructure?.() @@ -357,7 +360,7 @@ export const AnalyticView: React.FC = (props) => { setSelected(undefined) }) } else { - client?.updateChart?.(activePage, graph.id, 'line-chart', graph.deviceID, graph.keyID, graph.unit, graph.timeBucket, graph.x, graph.y, graph.w, graph.h, graph.totalize).then(() => { + client?.updateChart?.(activePage, graph.id, 'line-chart', graph.deviceID, graph.keyID, graph.unit, graph.timeBucket, graph.x, graph.y, graph.w, graph.h, graph.totalize, graph.xAxisDomain, graph.yAxisDomain).then(() => { openModal(false); // refetchStructure?.() // refetchValues?.() @@ -441,7 +444,7 @@ export const AnalyticView: React.FC = (props) => { dataKey={item.subkey?.name} label={`${item.tag?.name} - ${item.subkey?.name}`} total={item?.totalValue?.total ? (item?.totalValue?.total + (item.unit ? mathUnit(item.unit).units?.[0]?.unit.name : '')) : ''}> - + )} diff --git a/packages/core-ui/command-ui/CHANGELOG.md b/packages/core-ui/command-ui/CHANGELOG.md index 9721afede..5ed49fd61 100644 --- a/packages/core-ui/command-ui/CHANGELOG.md +++ b/packages/core-ui/command-ui/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/ui + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/ui + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/ui + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/ui + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/ui diff --git a/packages/core-ui/command-ui/package.json b/packages/core-ui/command-ui/package.json index 39f2be9b0..f296710de 100644 --- a/packages/core-ui/command-ui/package.json +++ b/packages/core-ui/command-ui/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/ui", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "publishConfig": { "access": "public" }, diff --git a/packages/core/command-alarms/CHANGELOG.md b/packages/core/command-alarms/CHANGELOG.md index 6564f30d6..4479d3419 100644 --- a/packages/core/command-alarms/CHANGELOG.md +++ b/packages/core/command-alarms/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/alarm-engine + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/alarm-engine + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/alarm-engine + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/alarm-engine + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/alarm-engine diff --git a/packages/core/command-alarms/package.json b/packages/core/command-alarms/package.json index 84686c88d..82d5ecd55 100644 --- a/packages/core/command-alarms/package.json +++ b/packages/core/command-alarms/package.json @@ -1,7 +1,7 @@ { "name": "@hive-command/alarm-engine", "main": "dist/index.js", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "packageManager": "yarn@3.6.0", "publishConfig": { "access": "public" @@ -20,6 +20,7 @@ }, "dependencies": { "@hive-command/interface-types": "workspace:^", + "@hive-command/scripting": "workspace:^", "nanoid": "3.x" } } diff --git a/packages/core/command-alarms/src/hook/utils.ts b/packages/core/command-alarms/src/hook/utils.ts index 762052623..c48466458 100644 --- a/packages/core/command-alarms/src/hook/utils.ts +++ b/packages/core/command-alarms/src/hook/utils.ts @@ -1,5 +1,6 @@ import { transpile, ModuleKind, JsxEmit } from 'typescript' import { HookInstance } from './types'; +import { FnTranspileOptions } from '@hive-command/scripting' export enum ALARM_LEVEL { CRITICAL, @@ -11,7 +12,7 @@ export const makeNotification = ( script: string ) => { - const jsCode = transpile(script, {module: ModuleKind.CommonJS, esModuleInterop: true, jsx: JsxEmit.React}) + const jsCode = transpile(script, FnTranspileOptions) const func = new Function( "module", @@ -50,7 +51,7 @@ export const makeHook = ( ${script} - `, { module: ModuleKind.CommonJS, esModuleInterop: true, jsx: JsxEmit.React }) + `, FnTranspileOptions) const func = new Function( "module", diff --git a/packages/core/command-alarms/tsconfig.json b/packages/core/command-alarms/tsconfig.json index 4ff8fba0f..18cedfd5a 100644 --- a/packages/core/command-alarms/tsconfig.json +++ b/packages/core/command-alarms/tsconfig.json @@ -103,6 +103,7 @@ }, "exclude": ["__tests__", "dist/"], "references": [ - {"path": "../../types/interface-types"} + {"path": "../../types/interface-types"}, + {"path": "../command-scripting"} ] } diff --git a/packages/core/command-scada/CHANGELOG.md b/packages/core/command-scada/CHANGELOG.md index 5e6c8f232..6913b3ded 100644 --- a/packages/core/command-scada/CHANGELOG.md +++ b/packages/core/command-scada/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/scada + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/scada + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/scada + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/scada + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/scada diff --git a/packages/core/command-scada/package.json b/packages/core/command-scada/package.json index e5814d6ef..b10949b2e 100644 --- a/packages/core/command-scada/package.json +++ b/packages/core/command-scada/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/scada", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "publishConfig": { "access": "public" }, diff --git a/packages/core/command-scada/src/config/index.ts b/packages/core/command-scada/src/config/index.ts index 2039c3ea9..f05d1cfe4 100644 --- a/packages/core/command-scada/src/config/index.ts +++ b/packages/core/command-scada/src/config/index.ts @@ -83,6 +83,7 @@ export class Configuration { rehydrate() { if (this.confExists()) { + console.log(this.path) try { const confJson = JSON.parse(this.readFile() || '{}') return confJson; diff --git a/packages/core/command-scada/src/drivers/index.ts b/packages/core/command-scada/src/drivers/index.ts index 639b9dbfd..2790dbaa5 100644 --- a/packages/core/command-scada/src/drivers/index.ts +++ b/packages/core/command-scada/src/drivers/index.ts @@ -259,14 +259,14 @@ export class DriverRegistry { } } - getDriver(pkg: string){ - return this.drivers[pkg]; + getDriver(id: string){ + return this.drivers[id]; } - async loadDriver(pkg: string, configuration: any){ + async loadDriver(id: string, pkg: string, configuration: any) { - if(this.drivers[pkg] && isEqual(this.driverConfigurations[pkg], configuration)) { - return this.drivers[pkg]; + if(this.drivers[id] && isEqual(this.driverConfigurations[id], configuration)) { + return this.drivers[id]; } const driver = await Driver({ @@ -274,21 +274,21 @@ export class DriverRegistry { configuration }); - this.driverConfigurations[pkg] = configuration; - this.drivers[pkg] = driver //as unknown as BaseCommandDriver + this.driverConfigurations[id] = configuration; + this.drivers[id] = driver //as unknown as BaseCommandDriver try{ - await this.drivers[pkg].start() + await this.drivers[id].start() }catch(e){ - console.log("Error starting driver", pkg, e); + console.log("Error starting driver", id, pkg, e); } - return this.drivers[pkg] + return this.drivers[id] } - async unloadDriver(pkg: string){ - this.drivers[pkg].stop?.(); + async unloadDriver(id: string){ + this.drivers[id].stop?.(); - delete this.drivers[pkg] + delete this.drivers[id] } diff --git a/packages/core/command-scada/src/index.ts b/packages/core/command-scada/src/index.ts index 746a9c9a6..e33986a1e 100644 --- a/packages/core/command-scada/src/index.ts +++ b/packages/core/command-scada/src/index.ts @@ -71,8 +71,11 @@ export class ScadaCommand extends EventEmitter { } async setup() { + console.debug("Setting up driverRegistry"); + await this.driverRegistry?.setup() + console.debug("Connecting to MQTT"); await this.client?.connect(async (message) => { try { @@ -96,15 +99,20 @@ export class ScadaCommand extends EventEmitter { }) if (this.options?.dataScopes) { + console.debug("Setting up connections to remote data-sources"); + let drivers = [...new Set(this.options.dataScopes.map((x) => x.plugin.module))].map((x) => ({ pkg: x })) await this.ensureDrivers(drivers) - await Promise.all((this.options?.dataScopes || []).map(async (dataScope) => { + for(var i = 0; i < (this.options?.dataScopes || [])?.length; i++){ + // await Promise.all((this.options?.dataScopes || []).map(async (dataScope) => { + const dataScope = this.options?.dataScopes[i]; + const configuration = Object.keys(dataScope.plugin.configuration).map((x) => ({ [x]: formatValue(dataScope.configuration[x], dataScope.plugin.configuration[x]) })).reduce((prev, curr) => ({...prev, ...curr}), {}) - const driver = await this.driverRegistry?.loadDriver(dataScope.plugin.module, configuration) + const driver = await this.driverRegistry?.loadDriver(dataScope.id, dataScope.plugin.module, configuration) let subscriptionTags = this.options?.tags?.filter((a) => a.scope?.id == dataScope.id).map((tag) => { let type = this.options?.types?.find((a) => a.name === tag.type) @@ -124,9 +132,14 @@ export class ScadaCommand extends EventEmitter { this.eventedValues.updateValue(dataKey, dataPatch[dataKey]); }) }); + + await new Promise((resolve) => setInterval(() => driver?.ready && resolve(true), 100)) - })) + // })) + } + + console.debug("Finished setting up remote data-sources") } } @@ -150,7 +163,7 @@ export class ScadaCommand extends EventEmitter { let tagOption = this.options?.tags?.find((a) => a.name == tagRoot); if(tagOption?.scope){ - const plugin = this.driverRegistry?.getDriver(tagOption.scope.plugin.module) + const plugin = this.driverRegistry?.getDriver(tagOption.scope.id) try{ await plugin?.write(tagPath, value); this.eventedValues.updateValue(tagPath, value) @@ -226,7 +239,7 @@ export class ScadaCommand extends EventEmitter { [x]: formatValue(dataScope.configuration[x], dataScope.plugin.configuration[x]) })).reduce((prev, curr) => ({...prev, ...curr}), {}) - const driver = await this.driverRegistry?.loadDriver(dataScope.plugin.module, configuration) + const driver = await this.driverRegistry?.loadDriver(dataScope.id, dataScope.plugin.module, configuration) let subscriptionTags = this.options?.tags?.filter((a) => a.scope?.id == dataScope.id).map((tag) => { let type = this.options?.types?.find((a) => a.name === tag.type) diff --git a/packages/core/command-schematic-export/CHANGELOG.md b/packages/core/command-schematic-export/CHANGELOG.md index f98a2edd4..64a42af71 100644 --- a/packages/core/command-schematic-export/CHANGELOG.md +++ b/packages/core/command-schematic-export/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/schematic-export + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/schematic-export + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/schematic-export + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/schematic-export + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/schematic-export diff --git a/packages/core/command-schematic-export/package.json b/packages/core/command-schematic-export/package.json index 325a07a84..a829726dc 100644 --- a/packages/core/command-schematic-export/package.json +++ b/packages/core/command-schematic-export/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/schematic-export", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "private": true, diff --git a/packages/core/command-scripting/CHANGELOG.md b/packages/core/command-scripting/CHANGELOG.md index e20c59da5..db456aee3 100644 --- a/packages/core/command-scripting/CHANGELOG.md +++ b/packages/core/command-scripting/CHANGELOG.md @@ -3,6 +3,30 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/scripting + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/scripting + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/scripting + + + + + ## [1.4.15-alpha.289](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.288...v1.4.15-alpha.289) (2023-12-11) **Note:** Version bump only for package @hive-command/scripting diff --git a/packages/core/command-scripting/package.json b/packages/core/command-scripting/package.json index 3faac67c8..16e40c655 100644 --- a/packages/core/command-scripting/package.json +++ b/packages/core/command-scripting/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/scripting", - "version": "1.4.15-alpha.289", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "publishConfig": { diff --git a/packages/core/command-scripting/src/index.ts b/packages/core/command-scripting/src/index.ts index 045329a55..f8de1170d 100644 --- a/packages/core/command-scripting/src/index.ts +++ b/packages/core/command-scripting/src/index.ts @@ -3,6 +3,7 @@ import { DataTypes } from './types'; export * from './generators' export * from './types' export * from './loaders' +export * from './transpilation' export const parseValue = (type: string, value: any ) => { diff --git a/packages/core/command-scripting/src/transpilation/index.ts b/packages/core/command-scripting/src/transpilation/index.ts new file mode 100644 index 000000000..d2617ba10 --- /dev/null +++ b/packages/core/command-scripting/src/transpilation/index.ts @@ -0,0 +1,12 @@ +import { ModuleKind, ScriptTarget, JsxEmit, CompilerOptions } from 'typescript' + +export const FnTranspileOptions : CompilerOptions = { + kind: ModuleKind.CommonJS, + target: ScriptTarget.ES5, + jsx: JsxEmit.React, + esModuleInterop: true +} + +export const UiTranspileOptions = { + // { kind: ModuleKind.CommonJS, jsx: JsxEmit.React, target: ScriptTarget.ES5 } +} \ No newline at end of file diff --git a/packages/core/evented-values/CHANGELOG.md b/packages/core/evented-values/CHANGELOG.md index a86e410ba..f66e1fa2a 100644 --- a/packages/core/evented-values/CHANGELOG.md +++ b/packages/core/evented-values/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/evented-values + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/evented-values + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/evented-values + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/evented-values + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/evented-values diff --git a/packages/core/evented-values/package.json b/packages/core/evented-values/package.json index 02d7c62d0..a74381f2d 100644 --- a/packages/core/evented-values/package.json +++ b/packages/core/evented-values/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/evented-values", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "main": "dist/index.js", "license": "MIT", "publishConfig": { diff --git a/packages/drivers/command-driver/CHANGELOG.md b/packages/drivers/command-driver/CHANGELOG.md index 9b354c776..2a869b40e 100644 --- a/packages/drivers/command-driver/CHANGELOG.md +++ b/packages/drivers/command-driver/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/drivers-base + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/drivers-base + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/drivers-base + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/drivers-base + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/drivers-base diff --git a/packages/drivers/command-driver/package.json b/packages/drivers/command-driver/package.json index 0857e1d18..a4f16d86b 100644 --- a/packages/drivers/command-driver/package.json +++ b/packages/drivers/command-driver/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/drivers-base", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "publishConfig": { "access": "public" diff --git a/packages/drivers/command-ethernet-ip/CHANGELOG.md b/packages/drivers/command-ethernet-ip/CHANGELOG.md index 64df4dc8f..8c068db19 100644 --- a/packages/drivers/command-ethernet-ip/CHANGELOG.md +++ b/packages/drivers/command-ethernet-ip/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/drivers-ethernet-ip + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/drivers-ethernet-ip + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/drivers-ethernet-ip + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/drivers-ethernet-ip + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/drivers-ethernet-ip diff --git a/packages/drivers/command-ethernet-ip/package.json b/packages/drivers/command-ethernet-ip/package.json index 757896099..13828a18a 100644 --- a/packages/drivers/command-ethernet-ip/package.json +++ b/packages/drivers/command-ethernet-ip/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/drivers-ethernet-ip", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "files": [ @@ -20,7 +20,7 @@ "typescript": "4.9.5" }, "dependencies": { - "@hive-command/drivers-base": "^1.4.15-alpha.309", + "@hive-command/drivers-base": "^1.4.15-alpha.313", "@hive-command/ethernet-ip": "^2.5.6-alpha.37", "observable-fns": "^0.6.1" } diff --git a/packages/drivers/command-opcua/CHANGELOG.md b/packages/drivers/command-opcua/CHANGELOG.md index 2948d18e1..5f2cd7bec 100644 --- a/packages/drivers/command-opcua/CHANGELOG.md +++ b/packages/drivers/command-opcua/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/drivers-opcua + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/drivers-opcua + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/drivers-opcua + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/drivers-opcua + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/drivers-opcua diff --git a/packages/drivers/command-opcua/package.json b/packages/drivers/command-opcua/package.json index fce8f06fd..0f8c1ead7 100644 --- a/packages/drivers/command-opcua/package.json +++ b/packages/drivers/command-opcua/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/drivers-opcua", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "files": [ @@ -20,8 +20,8 @@ "typescript": "4.9.5" }, "dependencies": { - "@hive-command/drivers-base": "^1.4.15-alpha.309", - "@hive-command/opcua-client": "^1.4.15-alpha.309", + "@hive-command/drivers-base": "^1.4.15-alpha.313", + "@hive-command/opcua-client": "^1.4.15-alpha.313", "cli-progress": "^3.12.0" } } diff --git a/packages/drivers/command-opcua/src/index.ts b/packages/drivers/command-opcua/src/index.ts index 0b13cb2ad..2f6763bfb 100644 --- a/packages/drivers/command-opcua/src/index.ts +++ b/packages/drivers/command-opcua/src/index.ts @@ -56,7 +56,7 @@ export default class OPCUADriver extends BaseCommandDriver { bar1.start(subscribeTags.length, 0); - new Promise(async (resolve) => { + const p = new Promise(async (resolve) => { //First read console.log(`Performing first read of ${subscribeTags.length} tags`); @@ -71,6 +71,8 @@ export default class OPCUADriver extends BaseCommandDriver { bar1.stop(); + console.log(`Performed first read of ${subscribeTags.length}`) + this.ready = true; //Subscribe diff --git a/packages/editors/electrical/CHANGELOG.md b/packages/editors/electrical/CHANGELOG.md index 9fbde4100..8dfaec8a9 100644 --- a/packages/editors/electrical/CHANGELOG.md +++ b/packages/editors/electrical/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/electrical-editor-v2 + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/electrical-editor-v2 + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/electrical-editor-v2 + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/electrical-editor-v2 + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/electrical-editor-v2 diff --git a/packages/editors/electrical/package.json b/packages/editors/electrical/package.json index bc22dc3da..7afbfea4d 100644 --- a/packages/editors/electrical/package.json +++ b/packages/editors/electrical/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/electrical-editor-v2", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "private": true, "packageManager": "yarn@3.6.0", "main": "dist/index.js", diff --git a/packages/editors/interface/CHANGELOG.md b/packages/editors/interface/CHANGELOG.md index f86a47cc0..789a085c2 100644 --- a/packages/editors/interface/CHANGELOG.md +++ b/packages/editors/interface/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/interface-editor + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/interface-editor + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/interface-editor + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/interface-editor + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/interface-editor diff --git a/packages/editors/interface/package.json b/packages/editors/interface/package.json index 239fa5af0..c213cb4c3 100644 --- a/packages/editors/interface/package.json +++ b/packages/editors/interface/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/interface-editor", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "packageManager": "yarn@3.6.4", "private": true, "files": [ diff --git a/packages/infrastructure/main/src/deployment.ts b/packages/infrastructure/main/src/deployment.ts index 6f64511c3..f0b564431 100644 --- a/packages/infrastructure/main/src/deployment.ts +++ b/packages/infrastructure/main/src/deployment.ts @@ -45,6 +45,10 @@ export const Deployment = (provider: Provider, rootServer: string, dbUrl: Output { name: "VERSION_SHIM", value: '1.0.10' }, { name: 'REDIS_URL', value: redisUrl.apply(url => url) }, + { name: 'BACKEND_ENTRYPOINT', value: process.env.BACKEND_ENTRYPOINT }, + { name: 'ENTRYPOINT', value: process.env.ENTRYPOINT }, + { name: 'HEXHIVE_SECRET', value: process.env.HEXHIVE_SECRET }, + { name: "DATABASE_URL", value: all([dbUrl, dbPass]).apply(([url, pass]) => `postgresql://postgres:${pass}@${url}/hivecommand?connect_timeout=100`) }, { name: 'REPORT_BUCKET', value: reportBucket }, { name: "SCHEMATIC_BUCKET", value: schematicBucket } diff --git a/packages/lambdas/compile-report/CHANGELOG.md b/packages/lambdas/compile-report/CHANGELOG.md index 2c6aef7fc..c118f275c 100644 --- a/packages/lambdas/compile-report/CHANGELOG.md +++ b/packages/lambdas/compile-report/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package compile-report + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package compile-report + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package compile-report + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package compile-report + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package compile-report diff --git a/packages/lambdas/compile-report/package.json b/packages/lambdas/compile-report/package.json index 6aa667a2c..370255d6e 100644 --- a/packages/lambdas/compile-report/package.json +++ b/packages/lambdas/compile-report/package.json @@ -1,6 +1,6 @@ { "name": "compile-report", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "dist/index.js", "private": true, diff --git a/packages/network/global-discovery-network/CHANGELOG.md b/packages/network/global-discovery-network/CHANGELOG.md index 719f8664a..c04af053b 100644 --- a/packages/network/global-discovery-network/CHANGELOG.md +++ b/packages/network/global-discovery-network/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/gds + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/gds + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/gds + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/gds + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/gds diff --git a/packages/network/global-discovery-network/package.json b/packages/network/global-discovery-network/package.json index 0cfbc58f9..6a873fc7f 100644 --- a/packages/network/global-discovery-network/package.json +++ b/packages/network/global-discovery-network/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/gds", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "index.js", "private": true, diff --git a/packages/network/mqtt-auth-server/CHANGELOG.md b/packages/network/mqtt-auth-server/CHANGELOG.md index 79e026c52..078ddd2d3 100644 --- a/packages/network/mqtt-auth-server/CHANGELOG.md +++ b/packages/network/mqtt-auth-server/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/mqtt-auth-server + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/mqtt-auth-server + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/mqtt-auth-server + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/mqtt-auth-server + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/mqtt-auth-server diff --git a/packages/network/mqtt-auth-server/package.json b/packages/network/mqtt-auth-server/package.json index df823916c..21fc57e73 100644 --- a/packages/network/mqtt-auth-server/package.json +++ b/packages/network/mqtt-auth-server/package.json @@ -1,6 +1,6 @@ { "name": "@hive-command/mqtt-auth-server", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "description": "", "main": "index.js", "private": true, @@ -23,7 +23,7 @@ "typescript": "4.9.5" }, "dependencies": { - "@hive-command/data": "^1.4.15-alpha.309", + "@hive-command/data": "^1.4.15-alpha.313", "@hive-command/rabbitmq-auth": "^1.4.15-alpha.289", "cors": "^2.8.5", "express": "^4.18.2", diff --git a/packages/types/discovery-api/CHANGELOG.md b/packages/types/discovery-api/CHANGELOG.md index 4c24eff5d..8e627b6e1 100644 --- a/packages/types/discovery-api/CHANGELOG.md +++ b/packages/types/discovery-api/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/discovery-api-types + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/discovery-api-types + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/discovery-api-types + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/discovery-api-types + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/discovery-api-types diff --git a/packages/types/discovery-api/package.json b/packages/types/discovery-api/package.json index 8a85200d1..37ae19d84 100644 --- a/packages/types/discovery-api/package.json +++ b/packages/types/discovery-api/package.json @@ -2,7 +2,7 @@ "name": "@hive-command/discovery-api-types", "packageManager": "yarn@3.6.0", "main": "dist/index.js", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "publishConfig": { "access": "public" }, diff --git a/packages/types/interface-types/CHANGELOG.md b/packages/types/interface-types/CHANGELOG.md index 7ea21f90e..7e066e072 100644 --- a/packages/types/interface-types/CHANGELOG.md +++ b/packages/types/interface-types/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.15-alpha.313](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.312...v1.4.15-alpha.313) (2024-09-17) + +**Note:** Version bump only for package @hive-command/interface-types + + + + + +## [1.4.15-alpha.312](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.311...v1.4.15-alpha.312) (2024-09-11) + +**Note:** Version bump only for package @hive-command/interface-types + + + + + +## [1.4.15-alpha.311](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.310...v1.4.15-alpha.311) (2024-05-23) + +**Note:** Version bump only for package @hive-command/interface-types + + + + + +## [1.4.15-alpha.310](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.309...v1.4.15-alpha.310) (2024-05-23) + +**Note:** Version bump only for package @hive-command/interface-types + + + + + ## [1.4.15-alpha.309](https://github.com/TheTechCompany/HiveCommand/compare/v1.4.15-alpha.308...v1.4.15-alpha.309) (2024-04-29) **Note:** Version bump only for package @hive-command/interface-types diff --git a/packages/types/interface-types/package.json b/packages/types/interface-types/package.json index bedf314e1..d83b89824 100644 --- a/packages/types/interface-types/package.json +++ b/packages/types/interface-types/package.json @@ -1,7 +1,7 @@ { "name": "@hive-command/interface-types", "packageManager": "yarn@3.6.4", - "version": "1.4.15-alpha.309", + "version": "1.4.15-alpha.313", "publishConfig": { "access": "public" }, @@ -18,5 +18,8 @@ }, "peerDependencies": { "typescript": "4.9.5" + }, + "dependencies": { + "@hive-command/scripting": "workspace:^" } } diff --git a/packages/types/interface-types/src/utils/index.ts b/packages/types/interface-types/src/utils/index.ts index 09e670be7..e37ee9180 100644 --- a/packages/types/interface-types/src/utils/index.ts +++ b/packages/types/interface-types/src/utils/index.ts @@ -12,6 +12,7 @@ import path from 'path'; import { Node } from 'reactflow'; import { isEqual, merge } from 'lodash' import { DataTransformer } from '../DataTransformer'; +import { FnTranspileOptions } from '@hive-command/scripting' export * from './useNodesWithValues' @@ -57,7 +58,7 @@ const _require = (components: any[], parent?: string) => { const module = { exports }; - const jsCode = transpile(content, { module: ModuleKind.CommonJS, esModuleInterop: true, jsx: JsxEmit.React }) + const jsCode = transpile(content, FnTranspileOptions) const func = new Function( "module", @@ -87,7 +88,7 @@ const _require = (components: any[], parent?: string) => { const module = { exports }; - const jsCode = transpile(fileObj.content, { module: ModuleKind.CommonJS, jsx: JsxEmit.React, esModuleInterop: true }); + const jsCode = transpile(fileObj.content, FnTranspileOptions); const func = new Function( @@ -173,7 +174,7 @@ export const getOptionValues = ( "showTagWindow", "React", "require", - transpile(templateOverride, { module: ModuleKind.CommonJS, target: ScriptTarget.ES5, jsx: JsxEmit.React })) as any; + transpile(templateOverride, FnTranspileOptions)) as any; func(module, exports, (elem, data) => { return functions.showWindow(elem, (state: any) => { @@ -263,7 +264,7 @@ export const getOptionValues = ( "showTagWindow", "React", "require", - transpile(optionValue.replace('script://', ''), { module: ModuleKind.CommonJS, target: ScriptTarget.ES5, jsx: JsxEmit.React })); + transpile(optionValue.replace('script://', ''), FnTranspileOptions)); diff --git a/packages/types/interface-types/tsconfig.json b/packages/types/interface-types/tsconfig.json index ea55e0b3c..10766bb35 100644 --- a/packages/types/interface-types/tsconfig.json +++ b/packages/types/interface-types/tsconfig.json @@ -106,5 +106,8 @@ /* Completeness */ // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ "skipLibCheck": true /* Skip type checking all .d.ts files. */ - } + }, + "references": [ + {"path": "../../core/command-scripting"} + ] } diff --git a/yarn.lock b/yarn.lock index 23c861006..cdf469653 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4353,27 +4353,38 @@ __metadata: languageName: node linkType: hard -"@hexhive/graphql-server@npm:1.0.2-beta.70": - version: 1.0.2-beta.70 - resolution: "@hexhive/graphql-server@npm:1.0.2-beta.70" +"@hexhive/crypto@npm:^1.0.2-beta.82": + version: 1.0.2-beta.82 + resolution: "@hexhive/crypto@npm:1.0.2-beta.82" + dependencies: + node-rsa: ^1.1.1 + checksum: 891b058d85f0e0f1188123c1b6a0dd2cab40d2d8c7eb26466fdacba0d1242fe6485a3b0b07b5fccd5624f1c63e817110985e7062056b38ea3725d1f9bb1c1ef4 + languageName: node + linkType: hard + +"@hexhive/graphql-server@npm:1.0.2-beta.82": + version: 1.0.2-beta.82 + resolution: "@hexhive/graphql-server@npm:1.0.2-beta.82" dependencies: "@casl/ability": ^6.5.0 "@graphql-tools/merge": ^8.2.6 "@graphql-tools/schema": ^8.3.5 "@graphql-tools/stitch": ^8.6.2 "@graphql-tools/stitching-directives": ^2.2.9 + "@hexhive/crypto": ^1.0.2-beta.82 "@ucast/core": ^1.10.2 "@ucast/mongo2js": ^1.3.4 graphql-helix: ^1.12.0 + graphql-http: ^1.22.1 graphql-scalars: ^1.17.0 graphql-type-json: ^0.3.2 graphql-upload: ^13.0.0 jsonwebtoken: ^8.5.1 jwks-rsa: ^2.0.5 + node-rsa: ^1.1.1 peerDependencies: graphql: 16.x - neo4j-driver: ^4.4.1 - checksum: 7d9f3f212a04a86dbe5dd446fa420c9336e64beb7a7350c569906abff6ab9c2e9ffc9e87d05047cc10ac3d40e6d90a5db3702c3fda184001d71a7a4ff6edac76 + checksum: 5169334d6ff095f88eeb1b285145370c466a0f8c67b1c42f5303046d638c77bc3671c9be6a58ce5add009163c3cb1cf5eb5b86471b1600085a591b8dc4d6a833 languageName: node linkType: hard @@ -4454,13 +4465,14 @@ __metadata: resolution: "@hive-command/alarm-engine@workspace:packages/core/command-alarms" dependencies: "@hive-command/interface-types": "workspace:^" + "@hive-command/scripting": "workspace:^" jest: 27.x nanoid: 3.x typescript: 4.9.5 languageName: unknown linkType: soft -"@hive-command/amqp-client@^1.4.15-alpha.309, @hive-command/amqp-client@workspace:^, @hive-command/amqp-client@workspace:packages/communication/amqp-client": +"@hive-command/amqp-client@^1.4.15-alpha.313, @hive-command/amqp-client@workspace:^, @hive-command/amqp-client@workspace:packages/communication/amqp-client": version: 0.0.0-use.local resolution: "@hive-command/amqp-client@workspace:packages/communication/amqp-client" dependencies: @@ -4475,8 +4487,8 @@ __metadata: version: 0.0.0-use.local resolution: "@hive-command/amqp-hub@workspace:packages/communication/amqp-hub" dependencies: - "@hive-command/amqp-client": ^1.4.15-alpha.309 - "@hive-command/data": ^1.4.15-alpha.309 + "@hive-command/amqp-client": ^1.4.15-alpha.313 + "@hive-command/data": ^1.4.15-alpha.313 "@types/amqplib": ^0.10.1 amqplib: ^0.10.3 dotenv: ^16.0.3 @@ -4488,7 +4500,7 @@ __metadata: languageName: unknown linkType: soft -"@hive-command/api@^1.4.15-alpha.309, @hive-command/api@workspace:packages/app/hivecommand-api": +"@hive-command/api@^1.4.15-alpha.313, @hive-command/api@workspace:packages/app/hivecommand-api": version: 0.0.0-use.local resolution: "@hive-command/api@workspace:packages/app/hivecommand-api" dependencies: @@ -4516,10 +4528,10 @@ __metadata: "@aws-sdk/s3-request-presigner": ^3.554.0 "@casl/ability": ^6.5.0 "@graphql-tools/merge": ^9.0.0 - "@hexhive/graphql-server": 1.0.2-beta.70 - "@hive-command/amqp-client": ^1.4.15-alpha.309 - "@hive-command/data": ^1.4.15-alpha.309 - "@hive-command/scripting": ^1.4.15-alpha.289 + "@hexhive/graphql-server": 1.0.2-beta.82 + "@hive-command/amqp-client": ^1.4.15-alpha.313 + "@hive-command/data": ^1.4.15-alpha.313 + "@hive-command/scripting": ^1.4.15-alpha.313 "@prisma/client": ^3.12.0 "@types/amqplib": ^0.8.2 "@types/cors": ^2.8.12 @@ -4529,7 +4541,7 @@ __metadata: axios: ^0.27.2 cors: ^2.8.5 csv: ^6.3.8 - dotenv: ^10.0.0 + dotenv: ^15.0.0 express: ^4.17.2 express-graphql: ^0.12.0 graphql: 15.x @@ -4553,7 +4565,7 @@ __metadata: languageName: unknown linkType: soft -"@hive-command/canvas-nodes@^1.4.15-alpha.309, @hive-command/canvas-nodes@workspace:^, @hive-command/canvas-nodes@workspace:packages/core-ui/command-canvas-nodes": +"@hive-command/canvas-nodes@^1.4.15-alpha.313, @hive-command/canvas-nodes@workspace:^, @hive-command/canvas-nodes@workspace:packages/core-ui/command-canvas-nodes": version: 0.0.0-use.local resolution: "@hive-command/canvas-nodes@workspace:packages/core-ui/command-canvas-nodes" dependencies: @@ -4580,7 +4592,7 @@ __metadata: resolution: "@hive-command/cli-client@workspace:packages/clients/cli-client" dependencies: "@hive-command/discovery-api-types": "workspace:^" - "@hive-command/scada": ^1.4.15-alpha.309 + "@hive-command/scada": ^1.4.15-alpha.313 axios: ^1.3.3 loglevel: ^1.8.1 typescript: 4.9.5 @@ -4590,7 +4602,7 @@ __metadata: languageName: unknown linkType: soft -"@hive-command/command-surface@^1.4.15-alpha.309, @hive-command/command-surface@workspace:packages/core-ui/command-surface": +"@hive-command/command-surface@^1.4.15-alpha.313, @hive-command/command-surface@workspace:packages/core-ui/command-surface": version: 0.0.0-use.local resolution: "@hive-command/command-surface@workspace:packages/core-ui/command-surface" dependencies: @@ -4600,10 +4612,10 @@ __metadata: "@hexhive/styles": ^1.0.1-alpha.45 "@hexhive/ui": 1.0.1-alpha.119 "@hexhive/utils": ^0.0.6-alpha.13 - "@hive-command/canvas-nodes": ^1.4.15-alpha.309 + "@hive-command/canvas-nodes": ^1.4.15-alpha.313 "@hive-command/interface-types": "workspace:^" "@hive-command/remote-components": ^1.4.15-alpha.289 - "@hive-command/scripting": ^1.4.15-alpha.289 + "@hive-command/scripting": ^1.4.15-alpha.313 "@mui/material": 5.15.0 "@mui/system": ^5.13.6 "@mui/x-tree-view": ^6.17.0 @@ -4641,12 +4653,13 @@ __metadata: languageName: node linkType: hard -"@hive-command/data@^1.4.15-alpha.309, @hive-command/data@workspace:^, @hive-command/data@workspace:packages/app/hivecommand-db": +"@hive-command/data@^1.4.15-alpha.313, @hive-command/data@workspace:^, @hive-command/data@workspace:packages/app/hivecommand-db": version: 0.0.0-use.local resolution: "@hive-command/data@workspace:packages/app/hivecommand-db" dependencies: "@prisma/client": ^5.0.0 prisma: ^5.0.0 + ts-node: ^10.9.2 typescript: 4.9.5 languageName: unknown linkType: soft @@ -4660,7 +4673,7 @@ __metadata: languageName: unknown linkType: soft -"@hive-command/drivers-base@^1.4.15-alpha.309, @hive-command/drivers-base@workspace:^, @hive-command/drivers-base@workspace:packages/drivers/command-driver": +"@hive-command/drivers-base@^1.4.15-alpha.313, @hive-command/drivers-base@workspace:^, @hive-command/drivers-base@workspace:packages/drivers/command-driver": version: 0.0.0-use.local resolution: "@hive-command/drivers-base@workspace:packages/drivers/command-driver" dependencies: @@ -4674,7 +4687,7 @@ __metadata: version: 0.0.0-use.local resolution: "@hive-command/drivers-ethernet-ip@workspace:packages/drivers/command-ethernet-ip" dependencies: - "@hive-command/drivers-base": ^1.4.15-alpha.309 + "@hive-command/drivers-base": ^1.4.15-alpha.313 "@hive-command/ethernet-ip": ^2.5.6-alpha.37 jest: ^27.x observable-fns: ^0.6.1 @@ -4686,8 +4699,8 @@ __metadata: version: 0.0.0-use.local resolution: "@hive-command/drivers-opcua@workspace:packages/drivers/command-opcua" dependencies: - "@hive-command/drivers-base": ^1.4.15-alpha.309 - "@hive-command/opcua-client": ^1.4.15-alpha.309 + "@hive-command/drivers-base": ^1.4.15-alpha.313 + "@hive-command/opcua-client": ^1.4.15-alpha.313 "@types/cli-progress": ^3.11.5 cli-progress: ^3.12.0 typescript: 4.9.5 @@ -4767,7 +4780,7 @@ __metadata: resolution: "@hive-command/enip-bridge@workspace:packages/communication/opc-ethernet-ip-bridge" dependencies: "@hive-command/ethernet-ip": ^2.5.6-alpha.31 - "@hive-command/opcua-server": ^1.4.15-alpha.309 + "@hive-command/opcua-server": ^1.4.15-alpha.313 "@types/express": ^4.17.14 express: ^4.18.2 jest: ^29.4.2 @@ -4792,7 +4805,7 @@ __metadata: languageName: node linkType: hard -"@hive-command/evented-values@^1.4.15-alpha.309, @hive-command/evented-values@workspace:^, @hive-command/evented-values@workspace:packages/core/evented-values": +"@hive-command/evented-values@^1.4.15-alpha.313, @hive-command/evented-values@workspace:^, @hive-command/evented-values@workspace:packages/core/evented-values": version: 0.0.0-use.local resolution: "@hive-command/evented-values@workspace:packages/core/evented-values" dependencies: @@ -4849,16 +4862,16 @@ __metadata: "@hexhive/auth-ui": 1.0.2-beta.44 "@hexhive/styles": 1.0.1-alpha.84 "@hexhive/ui": 1.0.1-alpha.119 - "@hive-command/api": ^1.4.15-alpha.309 - "@hive-command/canvas-nodes": ^1.4.15-alpha.309 - "@hive-command/command-surface": ^1.4.15-alpha.309 + "@hive-command/api": ^1.4.15-alpha.313 + "@hive-command/canvas-nodes": ^1.4.15-alpha.313 + "@hive-command/command-surface": ^1.4.15-alpha.313 "@hive-command/data-types": ^1.4.15-alpha.52 "@hive-command/electrical-editor": ^1.4.15-alpha.289 "@hive-command/electrical-editor-v2": "workspace:^" "@hive-command/interface-editor": "workspace:^" "@hive-command/interface-types": "workspace:^" "@hive-command/remote-components": ^1.4.15-alpha.289 - "@hive-command/scripting": ^1.4.15-alpha.289 + "@hive-command/scripting": ^1.4.15-alpha.313 "@monaco-editor/react": ^4.4.6 "@mui/base": 5.0.0-beta.40 "@mui/icons-material": ^5.6.2 @@ -5004,6 +5017,7 @@ __metadata: version: 0.0.0-use.local resolution: "@hive-command/interface-types@workspace:packages/types/interface-types" dependencies: + "@hive-command/scripting": "workspace:^" "@types/node": ^20.9.0 typescript: 4.9.5 peerDependencies: @@ -5015,7 +5029,7 @@ __metadata: version: 0.0.0-use.local resolution: "@hive-command/mqtt-auth-server@workspace:packages/network/mqtt-auth-server" dependencies: - "@hive-command/data": ^1.4.15-alpha.309 + "@hive-command/data": ^1.4.15-alpha.313 "@hive-command/rabbitmq-auth": ^1.4.15-alpha.289 "@types/body-parser": ^1.19.2 "@types/cors": ^2.8.13 @@ -5038,12 +5052,12 @@ __metadata: "@hexhive/styles": ^1.0.1-alpha.77 "@hexhive/ui": 1.0.1-alpha.119 "@hexhive/utils": ^0.0.6-alpha.13 - "@hive-command/api": ^1.4.15-alpha.309 - "@hive-command/command-surface": ^1.4.15-alpha.309 + "@hive-command/api": ^1.4.15-alpha.313 + "@hive-command/command-surface": ^1.4.15-alpha.313 "@hive-command/discovery-api-types": "workspace:^" "@hive-command/remote-components": ^1.4.15-alpha.289 - "@hive-command/scripting": ^1.4.15-alpha.289 - "@hive-command/sidecar-client": ^1.4.15-alpha.309 + "@hive-command/scripting": ^1.4.15-alpha.313 + "@hive-command/sidecar-client": ^1.4.15-alpha.313 "@monaco-editor/react": 4.6.0 "@mui/icons-material": ^5.11.16 "@mui/lab": 5.0.0-alpha.170 @@ -5079,9 +5093,9 @@ __metadata: version: 0.0.0-use.local resolution: "@hive-command/opcua-amqp-bridge@workspace:packages/communication/opc-amqp-bridge" dependencies: - "@hive-command/amqp-client": ^1.4.15-alpha.309 - "@hive-command/opcua-client": ^1.4.15-alpha.309 - "@hive-command/scripting": ^1.4.15-alpha.289 + "@hive-command/amqp-client": ^1.4.15-alpha.313 + "@hive-command/opcua-client": ^1.4.15-alpha.313 + "@hive-command/scripting": ^1.4.15-alpha.313 jest: 27.x lodash: ^4.17.21 loglevel: ^1.8.1 @@ -5091,11 +5105,11 @@ __metadata: languageName: unknown linkType: soft -"@hive-command/opcua-client@^1.4.15-alpha.309, @hive-command/opcua-client@workspace:packages/communication/opc-client": +"@hive-command/opcua-client@^1.4.15-alpha.313, @hive-command/opcua-client@workspace:packages/communication/opc-client": version: 0.0.0-use.local resolution: "@hive-command/opcua-client@workspace:packages/communication/opc-client" dependencies: - "@hive-command/opcua-server": ^1.4.15-alpha.309 + "@hive-command/opcua-server": ^1.4.15-alpha.313 "@hive-command/opcua-utils": ^1.4.15-alpha.289 "@sinonjs/fake-timers": ^10.0.2 "@types/jest": ^27.0.3 @@ -5106,18 +5120,18 @@ __metadata: node-opcua: 2.116.0 sinon: ^15.0.1 ts-jest: ^26.5.6 - ts-node: ^9.1.1 + ts-node: 10 typescript: 4.9.5 bin: opcua-client: ./dist/cmd.js languageName: unknown linkType: soft -"@hive-command/opcua-server@^1.4.15-alpha.309, @hive-command/opcua-server@workspace:packages/communication/opc-server": +"@hive-command/opcua-server@^1.4.15-alpha.313, @hive-command/opcua-server@workspace:packages/communication/opc-server": version: 0.0.0-use.local resolution: "@hive-command/opcua-server@workspace:packages/communication/opc-server" dependencies: - "@hive-command/opcua-client": ^1.4.15-alpha.309 + "@hive-command/opcua-client": ^1.4.15-alpha.313 "@hive-command/opcua-utils": ^1.4.15-alpha.289 "@types/jest": ^27.0.3 jest: ^26.6.3 @@ -5161,7 +5175,7 @@ __metadata: languageName: unknown linkType: soft -"@hive-command/scada@^1.4.15-alpha.309, @hive-command/scada@workspace:^, @hive-command/scada@workspace:packages/core/command-scada": +"@hive-command/scada@^1.4.15-alpha.313, @hive-command/scada@workspace:^, @hive-command/scada@workspace:packages/core/command-scada": version: 0.0.0-use.local resolution: "@hive-command/scada@workspace:packages/core/command-scada" dependencies: @@ -5208,7 +5222,7 @@ __metadata: languageName: unknown linkType: soft -"@hive-command/scripting@^1.4.15-alpha.289, @hive-command/scripting@workspace:packages/core/command-scripting": +"@hive-command/scripting@^1.4.15-alpha.313, @hive-command/scripting@workspace:^, @hive-command/scripting@workspace:packages/core/command-scripting": version: 0.0.0-use.local resolution: "@hive-command/scripting@workspace:packages/core/command-scripting" dependencies: @@ -5220,13 +5234,13 @@ __metadata: languageName: unknown linkType: soft -"@hive-command/sidecar-client@^1.4.15-alpha.309, @hive-command/sidecar-client@workspace:packages/clients/sidecar-client": +"@hive-command/sidecar-client@^1.4.15-alpha.313, @hive-command/sidecar-client@workspace:packages/clients/sidecar-client": version: 0.0.0-use.local resolution: "@hive-command/sidecar-client@workspace:packages/clients/sidecar-client" dependencies: - "@hive-command/amqp-client": ^1.4.15-alpha.309 - "@hive-command/drivers-base": ^1.4.15-alpha.309 - "@hive-command/evented-values": ^1.4.15-alpha.309 + "@hive-command/amqp-client": ^1.4.15-alpha.313 + "@hive-command/drivers-base": ^1.4.15-alpha.313 + "@hive-command/evented-values": ^1.4.15-alpha.313 "@hive-command/scada": "workspace:^" "@hive-command/threads": ^1.7.0 "@types/express": ^4.17.14 @@ -14812,7 +14826,7 @@ __metadata: languageName: node linkType: hard -"asn1@npm:~0.2.3": +"asn1@npm:^0.2.4, asn1@npm:~0.2.3": version: 0.2.6 resolution: "asn1@npm:0.2.6" dependencies: @@ -19157,6 +19171,13 @@ __metadata: languageName: node linkType: hard +"dotenv@npm:^15.0.0": + version: 15.0.1 + resolution: "dotenv@npm:15.0.1" + checksum: acebaa5b0bb23fdbbdc50827936bdf6782e935b73c6048e949df352515576ec9542455a93f58cc3eefd839e45c670fbfed250a1061eb72f536dab05745d1bf33 + languageName: node + linkType: hard + "dotenv@npm:^16.0.0, dotenv@npm:^16.0.1, dotenv@npm:^16.0.3, dotenv@npm:^16.3.1": version: 16.4.5 resolution: "dotenv@npm:16.4.5" @@ -22329,6 +22350,15 @@ __metadata: languageName: node linkType: hard +"graphql-http@npm:^1.22.1": + version: 1.22.1 + resolution: "graphql-http@npm:1.22.1" + peerDependencies: + graphql: ">=0.11 <=16" + checksum: b514ed17837c7622834ab306d886586296cc504abb1055223cb50ec145804ba4769a9d0b523504d79e955cc3e9469cf29f8153353d8715a94ee0c98fa5c54a3b + languageName: node + linkType: hard + "graphql-redis-subscriptions@npm:^2.5.0": version: 2.6.0 resolution: "graphql-redis-subscriptions@npm:2.6.0" @@ -29682,6 +29712,15 @@ __metadata: languageName: node linkType: hard +"node-rsa@npm:^1.1.1": + version: 1.1.1 + resolution: "node-rsa@npm:1.1.1" + dependencies: + asn1: ^0.2.4 + checksum: c03a6c8f69557326d2110086ce9610b4b17ef0fd594f76202225b7eb93fc0b342fb31714f6b3cf8d38320cf63c4790a3034e5d47a12f2c27d1900599ec9bd545 + languageName: node + linkType: hard + "node-watch@npm:0.7.3": version: 0.7.3 resolution: "node-watch@npm:0.7.3" @@ -37000,7 +37039,7 @@ __metadata: languageName: node linkType: hard -"ts-node@npm:^10.4.0, ts-node@npm:^10.9.1, ts-node@npm:^10.9.2": +"ts-node@npm:10, ts-node@npm:^10.4.0, ts-node@npm:^10.9.1, ts-node@npm:^10.9.2": version: 10.9.2 resolution: "ts-node@npm:10.9.2" dependencies: