Deno 2, Hash-Blobs, Fuseki Update

.devcontainer/devcontainer.json

@@ -0,0 +1,55 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/docker-existing-docker-compose
+// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
+{
+  "name": "Tridoc Backend Development",
+
+  // Use the independent dev container docker-compose configuration
+  "dockerComposeFile": "docker-compose.yml",
+
+  "containerEnv": {
+    "TRIDOC_PWD": "pw123",
+    "OCR_LANG": "deu"
+  },
+
+  // The 'service' property is the name of the service for the container that VS Code should
+  // use. Update this value and .devcontainer/docker-compose.yml to the real service name.
+  "service": "tridoc",
+
+  // The optional 'workspaceFolder' property is the path VS Code should open by default when
+  // connected. This is typically a file mount in .devcontainer/docker-compose.yml
+  "workspaceFolder": "/usr/src/app",
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  "forwardPorts": [8000, 8001],
+
+  // Start the fuseki service when the dev container starts
+  "runServices": ["fuseki"],
+
+  // Uncomment the next line if you want to keep your containers running after VS Code shuts down.
+  "shutdownAction": "stopCompose",
+
+  // Post-create command to set up the development environment
+  "postCreateCommand": "bash .devcontainer/setup-dev.sh",
+
+  // Connect as the deno user
+  "remoteUser": "deno",
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "denoland.vscode-deno"
+      ],
+      "settings": {
+        "deno.enable": true,
+        "deno.lint": true,
+        "terminal.integrated.defaultProfile.linux": "bash",
+        "terminal.integrated.profiles.linux": {
+          "bash": {
+            "path": "/bin/bash"
+          }
+        }
+      }
+    }
+  }
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,47 @@
+services:
+  # Development environment for tridoc-backend
+  tridoc:
+    build:
+      context: ..
+      dockerfile: Dockerfile
+    user: deno
+    volumes:
+      # Mount the entire workspace for development
+      - ..:/usr/src/app:cached
+      # Mount blobs directory separately if needed
+      - ../blobs:/usr/src/app/blobs
+    ports:
+      - "8000:8000"
+    depends_on:
+      fuseki:
+        condition: service_healthy
+    environment:
+      TRIDOC_PWD: "${TRIDOC_PWD:-pw123}"
+      OCR_LANG: "${OCR_LANG:-deu}"
+    # Keep container running for development
+    command: ["sleep", "infinity"]
+    networks:
+      - tridoc-dev
+
+  # Fuseki service accessible as 'fuseki' hostname
+  fuseki:
+    image: "linkedsolutions/fuseki-base:5.4.0"
+    environment:
+      ADMIN_PASSWORD: "${FUSEKI_PWD:-pw123}"
+    ports:
+      - "8001:3030" # Expose for development access
+    volumes:
+      - ./fuseki-data:/fuseki/base
+      - ../config-tdb.ttl:/config.ttl
+    healthcheck:
+      test: ["CMD", "curl", "-fsS", "http://localhost:3030/$/ping"]
+      interval: 5s
+      timeout: 3s
+      retries: 30
+      start_period: 10s
+    networks:
+      - tridoc-dev
+
+networks:
+  tridoc-dev:
+    driver: bridge

.devcontainer/setup-dev.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+echo "Setting up Tridoc Backend development environment..."
+
+# Ensure dataset exists using shared script (waits for Fuseki internally)
+if [ -f "./database-create.sh" ]; then
+    bash ./database-create.sh 3DOC || echo "(setup-dev) Dataset ensure script exited with non-zero status; continuing."
+else
+    echo "(setup-dev) WARNING: database-create.sh not found; skipping dataset ensure."
+fi
+
+# Cache Deno dependencies if deps.ts exists
+if [ -f "src/deps.ts" ]; then
+    echo "Caching Deno dependencies..."
+    deno cache src/deps.ts
+fi
+
+echo "Dataset bootstrap (if needed) complete."
+
+echo "Development environment setup complete!"
+echo ""
+echo "You can now run the Tridoc backend with:"
+echo "deno run --watch --allow-net --allow-read=blobs,rdf.ttl --allow-write=blobs,rdf.ttl --allow-run --allow-env=TRIDOC_PWD,FUSEKI_PWD,OCR_LANG src/main.ts"
+echo ""
+echo "Fuseki is available at:"
+echo "- Internal: http://fuseki:3030"
+echo "- External: http://localhost:8001"

.dockerignore

@@ -1,3 +1,4 @@
+old
 blobs
 fuseki-base
 node_modules

.gitignore

@@ -1,65 +1,12 @@
-# Logs
 logs
 *.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-
-# next.js build output
-.next
-
+node_modules
 blobs
-
-fuseki-base
+fuseki-data
+.devcontainer/.bash_history
+.bash_history
+.deno-dir

.vscode/launch.json

@@ -1,15 +1,28 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Launch Program",
-            "program": "${workspaceFolder}/lib/server",
-            "env": {"TRIDOC_PWD": "tridoc"}
-        }
-    ]
-}
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch Tridoc Backend",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceFolder}/src/main.ts",
+      "runtimeExecutable": "deno",
+      "runtimeArgs": [
+        "run",
+        "--watch",
+        "--no-prompt",
+        "--allow-net",
+        "--allow-read=blobs,rdf.ttl,/tmp",
+        "--allow-write=blobs,rdf.ttl,/tmp",
+        "--allow-run",
+        "--allow-env=FUSEKI_PWD,TRIDOC_PWD,OCR_LANG, TMPDIR"
+      ],
+      "attachSimplePort": 9229,
+      "env": {
+        "TRIDOC_PWD": "pw123",
+        "OCR_LANG": "deu"
+      },
+      "console": "integratedTerminal"
+    }
+  ]
+}

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "npm.packageManager": "yarn"
-}
+  "deno.enable": true,
+  "deno.lint": true
+}

.vscode/tasks.json

@@ -0,0 +1,77 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Start Tridoc Backend",
+      "type": "shell",
+      "command": "deno",
+      "args": [
+        "run",
+        "--watch",
+        "--no-prompt",
+        "--allow-net",
+        "--allow-read=blobs,rdf.ttl,/tmp",
+        "--allow-write=blobs,rdf.ttl,/tmp",
+        "--allow-run",
+        "--allow-env=TRIDOC_PWD,OCR_LANG,FUSEKI_PWD",
+        "src/main.ts"
+      ],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "new"
+      },
+      "problemMatcher": [],
+      "options": {
+        "env": {
+          "TRIDOC_PWD": "pw123",
+          "OCR_LANG": "deu"
+        }
+      }
+    },
+    {
+      "label": "Cache Dependencies",
+      "type": "shell",
+      "command": "deno",
+      "args": ["cache", "src/deps.ts"],
+      "group": "build",
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared"
+      }
+    },
+    {
+      "label": "Format Code",
+      "type": "shell",
+      "command": "deno",
+      "args": ["fmt"],
+      "group": "build",
+      "presentation": {
+        "echo": true,
+        "reveal": "silent",
+        "focus": false,
+        "panel": "shared"
+      }
+    },
+    {
+      "label": "Lint Code",
+      "type": "shell",
+      "command": "deno",
+      "args": ["lint"],
+      "group": "test",
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared"
+      }
+    }
+  ]
+}