No commit message

steedos · Dec 9, 2024 · e5994ef · e5994ef
2 parents 3d7aabe + 0796576
commit e5994ef
Show file tree

Hide file tree

Showing 95 changed files with 463 additions and 409 deletions.
diff --git a/deploy/community/app/platform/package.json b/deploy/community/app/platform/package.json
@@ -17,6 +17,7 @@
       "@azure/core-tracing": "1.0.1",
       "@azure/core-paging": "1.5.0",
       "@types/mime": "3.0.0",
-      "undici": "5.16.0"
+      "undici": "5.16.0",
+      "mingo": "6.4.15"
     }
   }
diff --git a/deploy/enterprise/app/platform/package.json b/deploy/enterprise/app/platform/package.json
@@ -1,25 +1,27 @@
 {
-    "name": "steedos-enterprise",
-    "private": true,
-    "scripts": {
-      "start": "steedos start"
-    },
-    "dependencies": {
-      "@steedos/service-community": "~2.7",
-      "@steedos/service-enterprise": "^2.5",
-      "@steedos-labs/analytics": "^0.1.32"
-    },
-    "resolutions": {
-      "@azure/core-auth": "1.5.0",
-      "@azure/core-client": "1.7.3",
-      "@azure/core-lro": "2.5.4",
-      "@azure/core-rest-pipeline": "1.12.1",
-      "@azure/core-util": "1.5.0",
-      "@azure/keyvault-keys": "4.7.2",
-      "@azure/logger": "1.0.4",
-      "@azure/core-tracing": "1.0.1",
-      "@azure/core-paging": "1.5.0",
-      "@types/mime": "3.0.0",
-      "undici": "5.16.0"
-    }
-  }
+  "name": "steedos-enterprise",
+  "private": true,
+  "scripts": {
+    "start": "steedos start"
+  },
+  "dependencies": {
+    "@builder6/mongodb-api": "^0.0.7",
+    "@steedos-labs/analytics": "^0.1.32",
+    "@steedos/service-community": "~2.7",
+    "@steedos/service-enterprise": "^2.5"
+  },
+  "resolutions": {
+    "@azure/core-auth": "1.5.0",
+    "@azure/core-client": "1.7.3",
+    "@azure/core-lro": "2.5.4",
+    "@azure/core-rest-pipeline": "1.12.1",
+    "@azure/core-util": "1.5.0",
+    "@azure/keyvault-keys": "4.7.2",
+    "@azure/logger": "1.0.4",
+    "@azure/core-tracing": "1.0.1",
+    "@azure/core-paging": "1.5.0",
+    "@types/mime": "3.0.0",
+    "undici": "5.16.0",
+    "mingo": "6.4.15"
+  }
+}
diff --git a/deploy/enterprise/fs/opt/steedos/entrypoint.sh b/deploy/enterprise/fs/opt/steedos/entrypoint.sh
@@ -242,6 +242,7 @@ configure_supervisord() {
   cp -f "$supervisord_conf_source"/steedos.conf "$SUPERVISORD_CONF_TARGET"
   cp -f "$supervisord_conf_source"/unpkg.conf "$SUPERVISORD_CONF_TARGET"
   cp -f "$supervisord_conf_source"/nodered.conf "$SUPERVISORD_CONF_TARGET"
+  cp -f "$supervisord_conf_source"/api.conf "$SUPERVISORD_CONF_TARGET"
 
   # Disable services based on configuration
   if [[ -z "${DYNO}" ]]; then
@@ -308,7 +309,7 @@ mkdir -p /steedos-storage/unpkg
 mkdir -p /steedos-storage/data/{backup,restore,nodered,unpkg}
 
 # Create sub-directory to store services log in the container mounting folder
-mkdir -p /steedos-storage/logs/{supervisor,steedos,cron,mongodb,redis,nginx,unpkg,nodered}
+mkdir -p /steedos-storage/logs/{supervisor,steedos,cron,mongodb,redis,nginx,unpkg,nodered,api}
 
 configure_supervisord
 

diff --git a/deploy/enterprise/fs/opt/steedos/templates/docker.env.sh b/deploy/enterprise/fs/opt/steedos/templates/docker.env.sh
@@ -19,6 +19,8 @@ STEEDOS_MONGODB_URI=mongodb://$MONGO_USER:$MONGO_PASSWORD@localhost:27017/steedo
 STEEDOS_MONGODB_USER=$MONGO_USER
 STEEDOS_MONGODB_PASSWORD=$MONGO_PASSWORD
 
+TABLES_MONGO_URL=mongodb://$MONGO_USER:$MONGO_PASSWORD@localhost:27017/tables?authSource=admin
+
 TRANSPORTER=redis://localhost:6379
 CACHER=redis://localhost:6379/1
 

diff --git a/deploy/enterprise/fs/opt/steedos/templates/nginx-app.conf.sh b/deploy/enterprise/fs/opt/steedos/templates/nginx-app.conf.sh
@@ -146,7 +146,6 @@ fi
     proxy_pass http://localhost:3100/unpkg/;
   }
 
-
   location /flows/ {
     proxy_http_version       1.1;
     proxy_set_header Upgrade \$http_upgrade;
@@ -166,5 +165,38 @@ fi
     alias /opt/steedos/info.json;
   }
 
+  location /api/v6/ {
+    proxy_http_version       1.1;
+    proxy_buffering          off;
+    proxy_max_temp_file_size 0;
+    proxy_redirect           off;
+    proxy_set_header  Host              \$http_host/api/v6/;
+    proxy_set_header  X-Forwarded-For   \$proxy_add_x_forwarded_for;
+    proxy_set_header  X-Forwarded-Proto \$origin_scheme;
+    proxy_set_header  X-Forwarded-Host  \$origin_host;
+    proxy_set_header  Connection        "";
+    proxy_pass http://localhost:5100/api/v6/;
+  }
+
+  location /v2/c/ {
+    proxy_http_version       1.1;
+    proxy_buffering          off;
+    proxy_max_temp_file_size 0;
+    proxy_redirect           off;
+    proxy_set_header  Host              \$http_host/v2/c/;
+    proxy_set_header  X-Forwarded-For   \$proxy_add_x_forwarded_for;
+    proxy_set_header  X-Forwarded-Proto \$origin_scheme;
+    proxy_set_header  X-Forwarded-Host  \$origin_host;
+    proxy_set_header  Connection        "";
+    proxy_pass http://localhost:5100/v2/c/;
+  }
+
+  location /v7/ {
+    proxy_pass http://localhost:5100/v7/;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade \$http_upgrade;
+    proxy_set_header Connection "upgrade";
+  }
+
 }
 EOF
diff --git a/deploy/enterprise/fs/opt/steedos/templates/supervisord/api.conf b/deploy/enterprise/fs/opt/steedos/templates/supervisord/api.conf
@@ -0,0 +1,16 @@
+[program:api]
+directory=/app/
+command=/opt/steedos/run-with-env.sh node ./node_modules/@builder6/mongodb-api/dist/main.js
+priority=15
+autostart=true
+autorestart=true
+startsecs=0
+startretries=3
+stdout_logfile=/steedos-storage/logs/%(program_name)s/%(program_name)s-%(ENV_HOSTNAME)s.log
+redirect_stderr=true
+stdout_logfile_maxbytes=10MB
+stderr_logfile_maxbytes=10MB
+stdout_logfile_backups=2
+stderr_logfile_backups=2
+stdout_events_enabled=true
+stderr_events_enabled=true
diff --git a/ee/sso-oidc/package.json b/ee/sso-oidc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steedos/ee_sso-oidc",
-  "version": "2.7.12-beta.7",
+  "version": "2.7.12-beta.8",
   "main": "package.service.js",
   "scripts": {
     "build": "tsc"
@@ -11,14 +11,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/accounts": "2.7.12-beta.7",
-    "@steedos/objectql": "2.7.12-beta.7",
-    "@steedos/service-package-loader": "2.7.12-beta.7",
+    "@steedos/accounts": "2.7.12-beta.8",
+    "@steedos/objectql": "2.7.12-beta.8",
+    "@steedos/service-package-loader": "2.7.12-beta.8",
     "@techpass/passport-openidconnect": "^0.3.2",
     "express": "4.18.1",
     "node-fetch": "^2.6.7",
     "passport": "^0.6.0",
     "request-ip": "^2.2.0"
   },
-  "gitHead": "27685d0b8591094138dbf5dd44ddf73cc854f375"
+  "gitHead": "8d0c9ff32464238908ef7114c9bb95087cfa482a"
 }
diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   ],
   "useWorkspaces": true,
   "npmClient": "yarn",
-  "version": "2.7.12-beta.7"
+  "version": "2.7.12-beta.8"
 }
diff --git a/packages/accounts/package.json b/packages/accounts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/accounts",
   "private": false,
-  "version": "2.7.12-beta.7",
+  "version": "2.7.12-beta.8",
   "main": "lib/index.js",
   "files": [
     "/package.json",
@@ -29,7 +29,7 @@
     "@accounts/two-factor": "^0.20.1",
     "@accounts/types": "0.20.1",
     "@babel/runtime": "^7.12.18",
-    "@steedos/utils": "2.7.12-beta.7",
+    "@steedos/utils": "2.7.12-beta.8",
     "app-root-path": "^2.2.1",
     "bcryptjs": "^2.4.3",
     "body-parser": "1.19.0",
@@ -56,20 +56,20 @@
     "validator": "^13.6.0"
   },
   "devDependencies": {
-    "@steedos/auth": "2.7.12-beta.7",
-    "@steedos/meteor-bundle-runner": "2.7.12-beta.7",
-    "@steedos/objectql": "2.7.12-beta.7",
+    "@steedos/auth": "2.7.12-beta.8",
+    "@steedos/meteor-bundle-runner": "2.7.12-beta.8",
+    "@steedos/objectql": "2.7.12-beta.8",
     "@types/dotenv-flow": "^3.0.0",
     "@types/node": "12.6.8",
     "cross-env": "^7.0.3",
     "dotenv": "^8.2.0",
     "dotenv-flow": "^3.1.0",
     "nodemon": "^2.0.19",
-    "steedos-server": "2.7.12-beta.7",
+    "steedos-server": "2.7.12-beta.8",
     "typescript": "4.6.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "27685d0b8591094138dbf5dd44ddf73cc854f375"
+  "gitHead": "8d0c9ff32464238908ef7114c9bb95087cfa482a"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/auth",
   "private": false,
-  "version": "2.7.12-beta.7",
+  "version": "2.7.12-beta.8",
   "main": "lib/index.js",
   "scripts": {
     "watch": "tsc --watch",
@@ -13,9 +13,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@steedos/cachers": "2.7.12-beta.7",
-    "@steedos/objectql": "2.7.12-beta.7",
-    "@steedos/utils": "2.7.12-beta.7",
+    "@steedos/cachers": "2.7.12-beta.8",
+    "@steedos/objectql": "2.7.12-beta.8",
+    "@steedos/utils": "2.7.12-beta.8",
     "bcryptjs": "^2.4.3",
     "cookies": "^0.8.0",
     "express": "^4.16.4",
@@ -27,5 +27,5 @@
   "devDependencies": {
     "typescript": "4.6.3"
   },
-  "gitHead": "27685d0b8591094138dbf5dd44ddf73cc854f375"
+  "gitHead": "8d0c9ff32464238908ef7114c9bb95087cfa482a"
 }
diff --git a/packages/cachers/package.json b/packages/cachers/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/cachers",
   "private": false,
-  "version": "2.7.12-beta.7",
+  "version": "2.7.12-beta.8",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -19,5 +19,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "27685d0b8591094138dbf5dd44ddf73cc854f375"
+  "gitHead": "8d0c9ff32464238908ef7114c9bb95087cfa482a"
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "steedos-cli",
-  "version": "2.7.12-beta.7",
+  "version": "2.7.12-beta.8",
   "description": "Develop and run your enterprise apps in miniutes",
   "main": "dist/index.js",
   "scripts": {
@@ -38,8 +38,8 @@
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.8.3",
     "@oclif/plugin-help": "^5.1.12",
-    "@steedos/metadata-core": "2.7.12-beta.7",
-    "@steedos/metadata-registrar": "2.7.12-beta.7",
+    "@steedos/metadata-core": "2.7.12-beta.8",
+    "@steedos/metadata-registrar": "2.7.12-beta.8",
     "archiver": "^5.0.2",
     "chalk": "2.4.2",
     "change-case": "^3.1.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "27685d0b8591094138dbf5dd44ddf73cc854f375"
+  "gitHead": "8d0c9ff32464238908ef7114c9bb95087cfa482a"
 }
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@steedos/client",
-  "version": "2.7.12-beta.7",
+  "version": "2.7.12-beta.8",
   "description": "client lib for steedos",
   "main": "lib/index.js",
   "scripts": {
@@ -17,8 +17,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@steedos/filters": "2.7.12-beta.7",
+    "@steedos/filters": "2.7.12-beta.8",
     "node-fetch": "^2.6.7"
   },
-  "gitHead": "27685d0b8591094138dbf5dd44ddf73cc854f375"
+  "gitHead": "8d0c9ff32464238908ef7114c9bb95087cfa482a"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@steedos/core",
   "private": false,
-  "version": "2.7.12-beta.7",
+  "version": "2.7.12-beta.8",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,15 +14,15 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/auth": "2.7.12-beta.7",
-    "@steedos/filters": "2.7.12-beta.7",
-    "@steedos/i18n": "2.7.12-beta.7",
-    "@steedos/metadata-core": "2.7.12-beta.7",
-    "@steedos/migrate": "2.7.12-beta.7",
-    "@steedos/objectql": "2.7.12-beta.7",
-    "@steedos/odata-v4-mongodb": "2.7.12-beta.7",
-    "@steedos/process": "2.7.12-beta.7",
-    "@steedos/standard-objects": "2.7.12-beta.7",
+    "@steedos/auth": "2.7.12-beta.8",
+    "@steedos/filters": "2.7.12-beta.8",
+    "@steedos/i18n": "2.7.12-beta.8",
+    "@steedos/metadata-core": "2.7.12-beta.8",
+    "@steedos/migrate": "2.7.12-beta.8",
+    "@steedos/objectql": "2.7.12-beta.8",
+    "@steedos/odata-v4-mongodb": "2.7.12-beta.8",
+    "@steedos/process": "2.7.12-beta.8",
+    "@steedos/standard-objects": "2.7.12-beta.8",
     "body-parser": "^1.18.1",
     "bunyan-sfdx-no-dtrace": "^1.8.2",
     "clone": "^2.1.2",
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@salesforce/kit": "1.0.4",
     "@salesforce/ts-types": "1.1.2",
-    "@steedos/meteor-bundle-runner": "2.7.12-beta.7",
+    "@steedos/meteor-bundle-runner": "2.7.12-beta.8",
     "@types/express": "^4.16.1",
     "@types/node": "^11.10.4",
     "@types/underscore": "^1.8.13",
@@ -57,5 +57,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "27685d0b8591094138dbf5dd44ddf73cc854f375"
+  "gitHead": "8d0c9ff32464238908ef7114c9bb95087cfa482a"
 }
diff --git a/packages/create-steedos-app/package.json b/packages/create-steedos-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.7.12-beta.7",
+  "version": "2.7.12-beta.8",
   "keywords": [
     "react",
     "steedos"
@@ -51,5 +51,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "27685d0b8591094138dbf5dd44ddf73cc854f375"
+  "gitHead": "8d0c9ff32464238908ef7114c9bb95087cfa482a"
 }