Update docker-compose.yml: open ports 20k-30k for deeplinks container

.github/workflows/server-build.yaml

@@ -0,0 +1,86 @@
+name: Server build
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Update dependencies
+        run: |
+          sudo apt-get update && sudo apt-get upgrade
+
+      - name: Install dependencies
+        run: |
+          sudo apt install -y git curl
+
+      - name: Allow ports 3006 and 3007
+        run: |
+          sudo ufw allow 3006
+          sudo ufw allow 3007
+
+      - name: Install Node Version Manager (NVM)
+        run: |
+          curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
+          export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+          nvm install 18 && nvm use 18 && nvm alias default 18
+          npm i -g npm@latest
+
+      - name: Install and configure @deep-foundation/deeplinks
+        run: |
+          npm rm --unsafe-perm -g @deep-foundation/deeplinks
+          npm install --unsafe-perm -g @deep-foundation/deeplinks@latest
+
+      - name: Set environment variables
+        run: |
+          export HOST_IP="185.105.118.59"
+          export DEEPCASE_HOST="$HOST_IP:3007"
+          export DEEPLINKS_HOST="$HOST_IP:3006"
+          export HASURA_ADMIN_SECRET=$(node -e "console.log(require('crypto').randomBytes(24).toString('hex'));")
+          export POSTGRES_PASSWORD=$(node -e "console.log(require('crypto').randomBytes(24).toString('hex'));")
+          export MINIO_ACCESS_KEY=$(node -e "console.log(require('crypto').randomBytes(24).toString('hex'));")
+          export MINIO_SECRET_KEY=$(node -e "console.log(require('crypto').randomBytes(24).toString('hex'));")
+
+      - name: Create call-options.json
+        run: |
+          tee call-options.json << JSON
+          {
+            "operation": "run",
+            "envs": {
+              "DEEPLINKS_PUBLIC_URL": "http://$DEEPLINKS_HOST",
+              "NEXT_PUBLIC_DEEPLINKS_URL": "http://$DEEPLINKS_HOST",
+              "NEXT_PUBLIC_GQL_PATH": "$DEEPLINKS_HOST/gql",
+              "NEXT_PUBLIC_GQL_SSL": "0",
+              "NEXT_PUBLIC_DEEPLINKS_SERVER": "http://$DEEPCASE_HOST",
+              "NEXT_PUBLIC_ENGINES_ROUTE": "0",
+              "NEXT_PUBLIC_DISABLE_CONNECTOR": "1",
+              "JWT_SECRET": "'{\"type\":\"HS256\",\"key\":\"$(node -e "console.log(require('crypto').randomBytes(50).toString('base64'));")\"}'",
+              "DEEPLINKS_HASURA_STORAGE_URL": "http://host.docker.internal:8000/",
+              "HASURA_GRAPHQL_ADMIN_SECRET": "$HASURA_ADMIN_SECRET",
+              "MIGRATIONS_HASURA_SECRET": "$HASURA_ADMIN_SECRET",
+              "DEEPLINKS_HASURA_SECRET": "$HASURA_ADMIN_SECRET",
+              "POSTGRES_PASSWORD": "$POSTGRES_PASSWORD",
+              "HASURA_GRAPHQL_DATABASE_URL": "postgres://postgres:$POSTGRES_PASSWORD@postgres:5432/postgres",
+              "POSTGRES_MIGRATIONS_SOURCE": "postgres://postgres:[email protected]:5432/postgres?sslmode=disable",
+              "RESTORE_VOLUME_FROM_SNAPSHOT": "0",
+              "MANUAL_MIGRATIONS": "1",
+              "MINIO_ROOT_USER": "$MINIO_ACCESS_KEY",
+              "MINIO_ROOT_PASSWORD": "$MINIO_SECRET_KEY",
+              "S3_ACCESS_KEY": "$MINIO_ACCESS_KEY",
+              "S3_SECRET_KEY": "$MINIO_SECRET_KEY"
+            }
+          }
+          JSON
+
+      - name: Run deeplinks
+        run: |
+          export DEEPLINKS_CALL_OPTIONS=$(cat call-options.json)
+          export DEBUG="deeplinks:engine:*,deeplinks:migrations:*"
+          deeplinks

.gitignore

@@ -138,6 +138,7 @@ projects/app/electron/app
 /automation/**/*.js
 /automation/**/*.js.map
 /automation/**/*.d.ts
+!/imports/engine-server.js
 
 # snapshots
 /snapshots/[0-9]*

.gitpod.yml

@@ -0,0 +1,3 @@
+tasks:
+  - init: npm ci
+    command: echo "hello"

README.md

@@ -28,7 +28,47 @@ Deep.Links is started together with Deep.Case app and other services in GitPod.
 4. Press `Enter` to execute that command again, that will finish restart sequence.
 ![IMG_1493](https://github.com/deep-foundation/deepcase-app/assets/1431904/56f48dad-d751-44c7-8871-164f824f122b)
 
+## Dignostics
+
+### Get all logs:
+
+```sh
+docker logs deep-links
+```
+
+### Get live logs:
+
+```sh
+docker logs -f deep-links
+```
+
+### Enter the sh from inside the docker container:
+
+```sh
+docker exec -it deep-links sh
+```
+
 ## Library
 See [Documentation] for examples and API
 
 [Documentation]: https://deep-foundation.github.io/deeplinks/
+
+## Maintenance
+
+### Refresh package-lock.json
+
+This command deletes `node_modules`, `package-lock.json` and runs `npm i`. So everything is refreshed.
+
+```bash
+npm run package:refresh
+```
+
+### Release a new version
+
+```bash
+npm run package:release
+```
+
+After that it might be required to release new versions of:
+1. https://github.com/deep-foundation/deepcase
+2. https://github.com/deep-foundation/deepcase-app

automation/remove-build-files.ts

@@ -1,21 +1,23 @@
-import glob from "glob";
-import fs from "fs-extra";
+export {}
 
-const options = {
-  ignore: "**/node_modules/**",
-  nodir: true,
-};
+// import glob from "glob";
+// import fs from "fs-extra";
 
-glob("./**/*.{d.ts,js,js.map}", options, (err, files) => {
-  if (err) {
-    console.log(err);
-    return;
-  }
+// const options = {
+//   ignore: "**/node_modules/**",
+//   nodir: true,
+// };
 
-  files.forEach((file) => {
-    fs.remove(file, (err) => {
-      if (err) console.error(`Failed to remove ${file}:`, err);
-      else console.log(`Successfully removed ${file}`);
-    });
-  });
-});
+// glob("./**/*.{d.ts,js,js.map}", options, (err, files) => {
+//   if (err) {
+//     console.log(err);
+//     return;
+//   }
+
+//   files.forEach((file) => {
+//     fs.remove(file, (err) => {
+//       if (err) console.error(`Failed to remove ${file}:`, err);
+//       else console.log(`Successfully removed ${file}`);
+//     });
+//   });
+// });

benchmarks/index.ts

@@ -23,53 +23,53 @@ const deep = new DeepClient({ apolloClient });
   var suite = new Suite();
   const admin = await deep.jwt({ linkId: await deep.id('deep', 'admin') });
   const deepAdmin = new DeepClient({ deep: deep, token: admin.token, linkId: admin.linkId });
-  const Query = await deep.id('@deep-foundation/core', 'Query');
+  const Query = deep.idLocal('@deep-foundation/core', 'Query');
   const guest = await deep.guest({});
   const deepGuest = new DeepClient({ deep: deepAdmin, ...guest });
 
   await deepAdmin.insert({
-    type_id: await deep.id('@deep-foundation/core', 'Rule'),
+    type_id: deep.idLocal('@deep-foundation/core', 'Rule'),
     out: { data: [
       {
-        type_id: await deep.id('@deep-foundation/core', 'RuleSubject'),
+        type_id: deep.idLocal('@deep-foundation/core', 'RuleSubject'),
         to: { data: {
-          type_id: await deep.id('@deep-foundation/core', 'Selector'),
+          type_id: deep.idLocal('@deep-foundation/core', 'Selector'),
           out: { data: [
             {
-              type_id: await deep.id('@deep-foundation/core', 'SelectorInclude'),
+              type_id: deep.idLocal('@deep-foundation/core', 'SelectorInclude'),
               to_id: guest.linkId,
               out: { data: {
-                type_id: await deep.id('@deep-foundation/core', 'SelectorTree'),
-                to_id: await deep.id('@deep-foundation/core', 'containTree'),
+                type_id: deep.idLocal('@deep-foundation/core', 'SelectorTree'),
+                to_id: deep.idLocal('@deep-foundation/core', 'containTree'),
               } },
             },
           ] }
         } }
       },
       {
-        type_id: await deep.id('@deep-foundation/core', 'RuleObject'),
+        type_id: deep.idLocal('@deep-foundation/core', 'RuleObject'),
         to: { data: {
-          type_id: await deep.id('@deep-foundation/core', 'Selector'),
+          type_id: deep.idLocal('@deep-foundation/core', 'Selector'),
           out: { data: {
-            type_id: await deep.id('@deep-foundation/core', 'SelectorInclude'),
-            to_id: await deep.id('@deep-foundation/core'),
+            type_id: deep.idLocal('@deep-foundation/core', 'SelectorInclude'),
+            to_id: deep.idLocal('@deep-foundation/core'),
             out: { data: {
-              type_id: await deep.id('@deep-foundation/core', 'SelectorTree'),
-              to_id: await deep.id('@deep-foundation/core', 'containTree'),
+              type_id: deep.idLocal('@deep-foundation/core', 'SelectorTree'),
+              to_id: deep.idLocal('@deep-foundation/core', 'containTree'),
             } },
           } }
         } }
       },
       {
-        type_id: await deep.id('@deep-foundation/core', 'RuleAction'),
+        type_id: deep.idLocal('@deep-foundation/core', 'RuleAction'),
         to: { data: {
-          type_id: await deep.id('@deep-foundation/core', 'Selector'),
+          type_id: deep.idLocal('@deep-foundation/core', 'Selector'),
           out: { data: {
-            type_id: await deep.id('@deep-foundation/core', 'SelectorInclude'),
-            to_id: await deep.id('@deep-foundation/core', 'AllowInsertType'),
+            type_id: deep.idLocal('@deep-foundation/core', 'SelectorInclude'),
+            to_id: deep.idLocal('@deep-foundation/core', 'AllowInsertType'),
             out: { data: {
-              type_id: await deep.id('@deep-foundation/core', 'SelectorTree'),
-              to_id: await deep.id('@deep-foundation/core', 'containTree'),
+              type_id: deep.idLocal('@deep-foundation/core', 'SelectorTree'),
+              to_id: deep.idLocal('@deep-foundation/core', 'containTree'),
             } },
           } }
         } }
@@ -83,7 +83,7 @@ const deep = new DeepClient({ apolloClient });
       deferred.resolve();
     } });
     suite.add('by deepRoot.id', { defer: true, fn: async function(deferred) {
-      await deep.id('@deep-foundation/core', 'Promise');
+      deep.idLocal('@deep-foundation/core', 'Promise');
       deferred.resolve();
     } });
     // suite.add('by deepGuest.id', { defer: true, fn: async function(deferred) {

call.cjs → call.mjs

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
-
-const { call } = require('./imports/engine-server.cjs');
+import { call } from './imports/engine-server.js';
 
 const DEEPLINKS_CALL_OPTIONS = process.env.DEEPLINKS_CALL_OPTIONS || '{ "operation": "run" }';
 

docker-prod/deep/docker-compose.yml

@@ -78,7 +78,7 @@ services:
         max-file: "3"
   minio:
     container_name: deep-minio
-    image: minio/minio
+    image: minio/minio:RELEASE.2023-09-30T07-02-29Z
     restart: always
     volumes:
       - 'minio-data:/export'

imports/bool_exp_to_sql.ts

@@ -3,6 +3,8 @@ import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import { HasuraApi } from '@deep-foundation/hasura/api.js';
 import { generateMutation, generateSerial } from './gql/index.js';
 import { DeepClient } from './client.js';
+import { Id } from './minilinks.js';
+import { serializeError } from 'serialize-error';
 
 const debug = Debug('deeplinks:bool_exp');
 const log = debug.extend('log');
@@ -30,11 +32,11 @@ export const userReplaceSymbol = 777777777778;
 export const itemPublicSymbol = 'X-Deep-Item-Id';
 export const userPublicSymbol = 'X-Deep-User-Id';
 
-export const applyBoolExpToLink = (sql: string, linkId: number) => {
+export const applyBoolExpToLink = (sql: string, linkId: Id) => {
   return sql.replace(`${itemReplaceSymbol}`, `${linkId}`);
 };
 
-export const boolExpToSQL = async (boolExpId: number, boolExpValue: any) => {
+export const boolExpToSQL = async (boolExpId: Id, boolExpValue: any) => {
   log('boolExpToSQL', boolExpId, boolExpValue);
   let gql, explained, sql;
   try {
@@ -66,7 +68,8 @@ export const boolExpToSQL = async (boolExpId: number, boolExpValue: any) => {
       }
     }
   } catch (e) {
-    error(e);
+    const serializedError = serializeError(e);
+    error(JSON.stringify(serializedError, null, 2));
     error('error', gql, explained, sql);
   }
 };

imports/client-handler.tsx

@@ -1,22 +1,28 @@
 import { DeepClient } from './client.js';
 import { gql } from '@apollo/client/index.js';
 
-export async function evalClientHandler({
-  value,
-  deep,
-  input = {},
-}: {
+/**
+ * Evaluates a client handler
+ * @returns A promise that resolves to an object with either an error property that contains error or data property that contains result of the handler.
+ */
+export async function evalClientHandler(options: {
   value: string;
   deep: DeepClient;
   input?: any;
 }): Promise<{
   error?: any;
   data?: any;
 }> {
+  const {
+    value,
+    deep,
+    input = {},
+  } = options;
   try {
     console.log('evalClientHandler', 'value', value);
+    // const evalResult = (new Function(`return ${value}`))();
+    // console.log('evalClientHandler', 'evalResult', evalResult);
     const evalResult = eval(value);
-    console.log('evalClientHandler', 'evalResult', evalResult);
     if (typeof evalResult === 'function') {
       return {
         data: await evalResult({ deep, gql, ...input }),
@@ -39,10 +45,10 @@ export async function evalClientHandler({
 //   isolation_provider_id,
 //   execution_provider_id,
 // }: {
-//   linkId: number;
+//   linkId: Id;
 //   deep: DeepClient;
-//   isolation_provider_id: number;
-//   execution_provider_id: number;
+//   isolation_provider_id: Id;
+//   execution_provider_id: Id;
 // }): Promise<{
 //   error?: any;
 //   data?: any;