Skip to content

Commit c9e560b

Browse files
skadefroskadefro
committed
Merge branch '1.5.11'
2 parents f0e0316 + 2e983f1 commit c9e560b

61 files changed

Lines changed: 8327 additions & 5731 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,13 @@ sonar-project.properties
1414
crash.log
1515
.devcontainer.old
1616
.clinic
17-
docker-compose.yml
17+
docker-compose.yml
18+
Makefile
19+
readme.md
20+
src/test
21+
register.js
22+
.mocharc.json
23+
.nyrc.json
24+
tsoa.json
25+
stripe
26+
Dockerfile

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ package-lock.json
2020
docker-compose.yml
2121
.aider*
2222
/public
23-
/public2
23+
/public2
24+
stripe

‎.vscode/settings.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
"--proto_path=messages"
55
]
66
},
7-
"compile-hero.disable-compile-files-on-did-save-code": true
7+
"compile-hero.disable-compile-files-on-did-save-code": true,
8+
"cmake.ignoreCMakeListsMissing": true,
9+
"makefile.configureOnOpen": false
810
}

‎Dockerfile‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,21 @@
1-
# FROM node:lts-alpine
2-
# FROM node:22.9.0-alpine3.20 AS base
3-
# FROM node:lts-alpine3.16
4-
FROM node:22.9-slim
5-
# alpine
6-
# RUN apk add --no-cache bash nano
7-
# debian
8-
RUN apt-get update && apt-get install -y nano git curl && rm -rf /var/lib/apt/lists/*
9-
10-
RUN mkdir /app
1+
FROM node:20 AS build-env
112
WORKDIR /app
12-
COPY package.json /app/
13-
# https://github.com/nodejs/docker-node/issues/1946#issuecomment-2459881919
14-
# ENV NPM_VERSION=10.3.0
15-
# RUN npm install -g npm@"${NPM_VERSION}" --omit=dev --production --no-audit --verbose --force
163

17-
RUN npm install --omit=dev --production --no-audit --verbose --force
18-
COPY . /app/
4+
RUN npm i -g typescript
5+
COPY package.json /app/
6+
COPY package-lock.json /app/
7+
RUN npm ci --omit=dev
8+
COPY . /app
199
RUN npm run build
10+
11+
# https://github.com/GoogleContainerTools/distroless
12+
FROM gcr.io/distroless/nodejs20-debian12
13+
COPY --from=build-env /app /app
2014
COPY public /app/dist/public
2115
COPY public.template /app/dist/public.template
22-
2316
WORKDIR /app/dist
2417

2518
ENV HOME=.
2619
EXPOSE 3000
2720
EXPOSE 5858
28-
ENTRYPOINT ["/usr/local/bin/node", "--inspect=0.0.0.0:5858", "index.js"]
29-
30-
# docker buildx build --platform linux/amd64 -t openiap/openflow:edge . --push
31-
# docker buildx build --platform linux/amd64 -t openiap/openflow:dev . --push
32-
33-
# docker run -it --rm openiap/openflow:edge /bin/bash
21+
CMD ["--inspect=0.0.0.0:5858", "index.js"]

‎Makefile‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
.PHONY: build
2+
3+
VERSION = 1.5.11.124
4+
HASH = $(shell git rev-parse --short HEAD)
5+
bump:
6+
@echo "Bumping version to $(VERSION) recursively..."
7+
8+
@sed -i 's/"version": "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+"/"version": "$(VERSION)"/' package.json
9+
@find public.template -name "swagger.json" -exec sed -i 's/"version": "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+"/"version": "$(VERSION)"/' {} \;
10+
@find src/public -name "swagger.json" -exec sed -i 's/"version": "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+"/"version": "$(VERSION)"/' {} \;
11+
build: bump
12+
@npm run build
13+
initdocker:
14+
@docker buildx create --name openiap --use
15+
@docker buildx inspect --bootstrap
16+
load:
17+
@docker buildx build -t openiap/openflow:$(VERSION) -t openiap/openflow:$(HASH) -t openiap/openflow:edge --platform linux/amd64 --load .
18+
compose-no-cache: bump
19+
@docker buildx build --no-cache -t openiap/openflow:$(VERSION) -t openiap/openflow:$(HASH) -t openiap/openflow:edge --platform linux/amd64 --push .
20+
compose: bump
21+
@docker buildx build -t openiap/openflow:$(VERSION) -t openiap/openflow:$(HASH) -t openiap/openflow:edge --platform linux/amd64 --push .
22+
publish: bump
23+
@docker buildx build -t openiap/openflow:$(VERSION) -t openiap/openflow:$(HASH) -t openiap/openflow:latest --platform linux/amd64,linux/arm64,linux/arm/v7 --push .
24+
copypublic: bump
25+
@rm -rf public && cp -r ../core-web/build/ public
26+
copypublicold: bump
27+
@rm -rf public && cp -r ../openflow-web/dist/ public
28+
linkpublicold: bump
29+
@rm -rf public && ln -s /mnt/data/vscode/config/workspace/code/openflow-web/dist /mnt/data/vscode/config/workspace/code/openflow/public

‎dockerignore‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎gulpfile.js‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎package.json‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@openiap/core",
3-
"version": "1.5.10.62",
3+
"version": "1.5.11.124",
44
"description": "Easy orchestration of data, code and automation tools.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
55
"main": "index.js",
66
"scripts": {
@@ -12,14 +12,16 @@
1212
"updateapilocal": "npm uninstall @openiap/nodeapi && npm i ../nodeapi",
1313
"updateapidev": "npm uninstall @openiap/nodeapi && npm i openiap/nodeapi",
1414
"updateapi": "npm uninstall @openiap/nodeapi && npm i @openiap/nodeapi",
15+
"updatejsapi": "npm uninstall @openiap/jsapi && npm i openiap/jsapi#esm",
1516
"ncu": "npx -y npm-check-updates",
1617
"spec": "tsoa spec",
1718
"routes": "tsoa routes",
1819
"generate": "tsoa spec && tsoa routes",
1920
"copypublic": "rm -rf public && cp -r ../openflow-web/dist/ public",
2021
"linkpublic": "rm -rf public && ln -s /mnt/data/vscode/config/workspace/code/openflow-web/dist /mnt/data/vscode/config/workspace/code/openflow/public",
2122
"copypublic2": "rm -rf public && cp -r ../core-web/build/ public",
22-
"linkpublic2": "rm -rf public && ln -s /mnt/data/vscode/config/workspace/code/core-web/build /mnt/data/vscode/config/workspace/code/openflow/public"
23+
"linkpublic2": "rm -rf public && ln -s /mnt/data/vscode/config/workspace/code/core-web/build /mnt/data/vscode/config/workspace/code/openflow/public",
24+
"inspector": "npx @modelcontextprotocol/inspector "
2325
},
2426
"repository": {
2527
"type": "git",
@@ -38,13 +40,18 @@
3840
"funding": "https://github.com/sponsors/skadefro",
3941
"dependencies": {
4042
"@kubernetes/client-node": "0.21.0",
43+
"@modelcontextprotocol/sdk": "^1.9.0",
4144
"@node-saml/passport-saml": "4.0.1",
42-
"@openiap/cloud-git-mongodb": "1.0.38",
43-
"@openiap/nodeapi": "0.0.38",
45+
"@openiap/cloud-git-mongodb": "1.0.39",
46+
"@openiap/jsapi": "github:openiap/jsapi#esm",
47+
"@openiap/nodeapi": "0.0.41",
4448
"@openiap/openflow-api": "2.1.12",
45-
"@opentelemetry/exporter-metrics-otlp-grpc": "0.43.0",
46-
"@opentelemetry/sdk-node": "0.43.0",
47-
"@testdeck/mocha": "0.3.3",
49+
"@opentelemetry/api-logs": "0.57.1",
50+
"@opentelemetry/exporter-logs-otlp-grpc": "0.57.1",
51+
"@opentelemetry/exporter-metrics-otlp-grpc": "0.57.1",
52+
"@opentelemetry/exporter-metrics-otlp-http": "^0.57.1",
53+
"@opentelemetry/exporter-trace-otlp-http": "^0.57.1",
54+
"@opentelemetry/sdk-node": "0.57.1",
4855
"amqplib": "0.10.4",
4956
"bcryptjs": "2.4.3",
5057
"cache-manager": "5.2.3",
@@ -55,6 +62,7 @@
5562
"dockerode": "3.3.4",
5663
"dotenv": "16.4.5",
5764
"express": "4.19.2",
65+
"global-agent": "^3.0.0",
5866
"got": "11.8.5",
5967
"hjson": "3.2.2",
6068
"ip": "2.0.1",
@@ -85,19 +93,21 @@
8593
"systeminformation": "5.22.11",
8694
"tsoa": "5.1.1",
8795
"tsx": "4.16.0",
88-
"typescript": "4.8.4",
8996
"web-push": "3.6.7",
9097
"ws": "8.17.1",
9198
"xml2js": "0.4.23"
9299
},
93100
"devDependencies": {
101+
"@testdeck/mocha": "0.3.3",
94102
"@types/amqplib": "0.10.5",
95103
"@types/mocha": "10.0.7",
96104
"@types/node": "20.14.9",
97105
"@types/passport": "1.0.16",
98106
"gulp": "4.0.2",
99107
"gulp-shell": "0.8.0",
100108
"mocha": "10.5.2",
101-
"nyc": "17.0.0"
109+
"nyc": "17.0.0",
110+
"typescript": "4.8.4",
111+
"wtfnode": "0.10.0"
102112
}
103113
}

‎public.template/swagger.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@
513513
},
514514
"info": {
515515
"title": "@openiap/core",
516-
"version": "1.5.10.50",
516+
"version": "1.5.11.124",
517517
"description": "Easy orchestration of data, code and automation tools.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
518518
"license": {
519519
"name": "MPL-2.0"

0 commit comments

Comments
 (0)