New jamtools main

Dockerfile

@@ -0,0 +1,87 @@
+FROM ubuntu
+
+# Install SSH and other dependencies
+RUN apt update && apt install -y openssh-server
+RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+
+# Install necessary tools and libraries
+RUN apt-get update && apt-get install -y --no-install-recommends apt-utils && \
+        apt-get install -y -q wget \
+        build-essential \
+        python3 \
+        unzip \
+        libbsd-dev \
+        git \
+        sudo \
+        vim \
+        curl \
+        make \
+        clang \
+        iproute2 \
+        net-tools \
+        unzip \
+        iputils-ping \
+        mosquitto \
+        mosquitto-clients \
+        libmosquitto-dev \
+        redis-server \
+        redis-tools \
+        libhiredis-dev \
+        libevent-dev \
+        tmux \
+        inotify-tools
+
+# Create an admin user with sudo privileges
+RUN useradd -m admin && echo "admin:admin" | chpasswd && adduser admin sudo
+RUN echo "admin ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
+USER admin
+
+# Set up Node.js
+WORKDIR /home/admin
+RUN wget https://deb.nodesource.com/setup_20.x && chmod +x ./setup_20.x && echo admin | sudo -S ./setup_20.x && \
+        sudo apt-get install -y -q nodejs
+
+# Clone JAMScript repository and build dependencies
+RUN git clone --branch shahin/migration https://github.com/citelab/JAMScript
+
+WORKDIR /home/admin/JAMScript/deps
+RUN git clone https://github.com/intel/tinycbor && \
+    cd tinycbor && \
+    make && sudo make install
+
+WORKDIR /home/admin/JAMScript/deps/mujs2
+RUN make && sudo make install
+
+# Install JAMScript dependencies and global npm package
+WORKDIR /home/admin/JAMScript
+RUN npm install
+RUN sudo npm install zx -g
+
+# Additional setup for JAMScript
+WORKDIR /home/admin/JAMScript/lib/cside
+RUN make archive
+
+WORKDIR /home/admin
+RUN mkdir -p .jamruns && \
+    ln -s /home/admin/JAMScript/lib/cside .jamruns/clib && \
+    ln -s /home/admin/JAMScript .jamruns/jamhome && \
+    ln -s /home/admin/JAMScript/lib/jside .jamruns/node_modules
+
+# Configure npm global installation path
+RUN mkdir .npm-global && mkdir .npm-global/bin
+ENV PATH="$PATH:/home/admin/JAMScript/tools:/home/admin/.npm-global/bin"
+
+# Expose SSH port
+EXPOSE 22
+
+# Copy the code from the current directory to /home/admin/code in the container
+WORKDIR /home/admin/code
+COPY . /home/admin/code
+
+# Run npm install and install.sh as admin
+RUN npm install
+RUN sudo chmod +x /home/admin/code/install.sh && /home/admin/code/install.sh
+
+# Start SSH and keep the container running
+ENTRYPOINT sudo service ssh start && tail -f /dev/null
+

README.md

@@ -1,8 +1,127 @@
-[![Build Status](https://travis-ci.org/citelab/JAMScript.svg?branch=master)](https://travis-ci.org/citelab/JAMScript)
+# Redesigning JAMScript Tools for High-Performance and Scalability
 
+This repository is part of an ongoing effort to redesign the JAMScript tools with a focus on high-performance execution and scalable infrastructure. 
+To achieve this, we've restructured the architecture around a client-server model that separates the responsibilities of coordination and computation. 
 
-# A Programming Language and Middleware for Cloud of Moving Things
+## 🔧 Getting Started
 
-This project is currently under development. You can see the documentation and install instructions at https://citelab.github.io/JAMScript.
+### 1. Clone the Repository
+
+Start by cloning the repository and switching to the appropriate branch:
+
+```bash
+git clone https://github.com/JeanKa25/JAMScript.git
+```
+
+Then run the install.sh to install all the dependencies:
+
+
+### 2. Set Environment Variables
+Export the following global variables:
+
+```bash
+export JAMHOME=~/JAMScript
+export PATH=$JAM_HOME/tools:$PATH
+export JAMDATA=~/JAMScript/data
+```
+
+To make these changes permanent, add them to your .bashrc:
+
+```bash
+echo 'export JAMHOME=~/JAMScript' >> ~/.bashrc
+echo 'export PATH=$JAM_HOME/tools:$PATH' >> ~/.bashrc
+echo 'export JAMDATA=~/JAMScript/data' >> ~/.bashrc
+source ~/.bashrc
+```
+
+
+## ⚙️ Installing Dependencies with Ansible
+
+You can set up your environment using Ansible with the provided playbook:
+
+### 1. Install Ansible (if not already installed)
+
+```bash
+sudo apt update
+sudo apt install ansible -y
+```
+
+### 2. Run the setup playbook
+
+```bash
+ansible-playbook setup_jamscript.yml -i localhost,
+```
+
+> This playbook installs required dependencies, clones the repo, and configures environment variables as needed for JAMScript tools.
+
+---
+
+## 🌐 Running the Server
+
+To start the JAMScript server, navigate to the tools directory and run the server file:
+
+```bash
+cd ~/JAMScript/tools
+node app-docker.js
+```
+
+### 🔧 Path and IP Configuration
+
+Before running the server, make sure to update the following files:
+
+#### `app-docker.js`
+- Set the `serverip` parameter to the IP address of the server.
+
+#### `Wrapper.mjs`
+- Update the following:
+  - `serverip`: match the IP set in `app-docker.js`.
+  - Path to JAMScript tools directory.
+  - Path to your SSH `authorized_keys` file (used for key-based SSH access).
+
+> These updates ensure that the tools can communicate correctly and execute remote tasks securely.
+
+---
+
+### 🚀 Available Ansible Playbooks
+
+#### Server Run Playbook
+
+```bash
+ansible-playbook serverrun-playbook.yml --extra-vars "server=server2"
+```
+
+#### JamRun Playbook
+
+```bash
+ansible-playbook jamrun-playbook.yml --extra-vars "server=server2 file=jt1.jxe app='--app=DEMO'"
+```
+
+#### JamList Playbook
+
+```bash
+ansible-playbook jamlist-playbook.yml --extra-vars "server=server2"
+```
+
+#### JamTerm Playbook (Without tmux session)
+
+```bash
+ansible-playbook jamterm-playbook.yml --extra-vars "server=server2"
+```
+
+#### JamTerm Playbook (With tmux session)
+
+```bash
+ansible-playbook jamterm-playbook.yml --extra-vars "server=server2 tmux=u-1001-dev-112-c"
+```
+
+#### JamKill Playbook
+
+```bash
+ansible-playbook jamkill-playbook.yml --extra-vars "server=server2"
+```
+
+#### Server Kill Playbook
+
+```bash
+ansible-playbook serverkill-playbook.yml --extra-vars "server=server2"
 
-Programs written in JAMScript have worked in Linux (Arch, Ubuntu, Raspbian) and Mac OS.

install.sh

@@ -149,7 +149,7 @@ cd $SCRIPT_DIR
 git submodule update --init --recursive lib/
 
 #install tinycbor
-cd $SCRIPT_DIR/deps/tinycbor
+cd $SCRIPT_DIR/deps
 git clone https://github.com/intel/tinycbor
 cd tinycbor
 make

mainCompiler.js

@@ -210,7 +210,7 @@ function nativeCompile(code, cargs, userIncludes, userLinkerFlags) {
         fs.writeFileSync(`${tmpDir}/jamout.c`, code);
 
         try {
-            var command = `clang -g ${tmpDir}/jamout.c -o ${tmpDir}/a.out -I/usr/local/include -I${homeDir}/.jamruns/clib/include -I${homeDir}/.jamruns/clib/src ${options} -pthread -ltinycbor -lmosquitto -lhiredis -levent ${userLinkerFlags.join(" ")} ${homeDir}/.jamruns/clib/libjam.a  ${homeDir}/.jamruns/jamhome/deps/mujs2/build/release/libmujs.a -L/usr/local/lib ${includes}`;
+            var command = `clang -g ${tmpDir}/jamout.c -o ${tmpDir}/a.out -I/usr/local/include -I${homeDir}/.jamruns/clib/include -I${homeDir}/.jamruns/clib/src ${options} -pthread -ltinycbor -lmosquitto -lhiredis -levent ${userLinkerFlags.join(" ")} ${homeDir}/.jamruns/clib/libjam.a  ${homeDir}/.jamruns/jamhome/deps/mujs2/build/release/libmujs.a ${homeDir}/.jamruns/jamhome/deps/tinycbor/lib/libtinycbor.a ${includes}`;
 
             if (args.verbosity) console.log("[C] Compiling code...");
             if (cargs.verbosity == 2) {

package.json

@@ -24,22 +24,26 @@
     },
     "dependencies": {
         "cbor-x": "1.5.4",
-        "command-line-args": ">= 3.0.5",
+        "chokidar": "^3.6.0",
+        "command-line-args": "^5.2.1",
         "command-line-usage": "^6.1.0",
         "express": "^4.18.2",
         "ioredis": "^5.3.2",
         "jszip": "^3.10.1",
+        "lodash": "^4.17.21",
         "mercator-projection": "^0.0.2",
         "mqtt": "=4.3.7",
+        "node-fetch": "^3.3.2",
         "node-localstorage": ">= 1.3.0",
         "node-ssh": "^13.1.0",
-        "ohm-js": "17.1.0",
+        "ohm-js": "^17.1.0",
         "pino": "^8.15.0",
         "ps-node": "^0.1.6",
         "random-js": "^2.1.0",
         "redis": "^2.8.0",
         "toml": "3.0.0",
-        "ws": "^8.13.0"
+        "ws": "^8.13.0",
+        "zx": "^8.3.0"
     },
     "engines": {
         "node": ">= 12.22",

scripts/install/Dockerfile

@@ -1,36 +1,81 @@
 FROM ubuntu
+
+# Install OpenSSH server and sudo
+RUN apt update && apt install -y openssh-server sudo
+
+RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+
 RUN apt-get update && apt-get install -y --no-install-recommends apt-utils && \
         apt-get install -y -q wget \
         build-essential \
-        python \
+        python3 \
         unzip \
         libbsd-dev \
         git \
         sudo \
         vim \
         curl \
-        libssl-dev \
-        cmake \
+        make \
+        clang \
         iproute2 \
         net-tools \
-        iputils-ping \
+        unzip \
+        iputils-ping
+
+RUN apt-get install -y -q mosquitto \
+        mosquitto-clients \
+        libmosquitto-dev
+
+RUN apt-get install -y -q redis-server \
+        redis-tools \
+        libhiredis-dev
+
+RUN apt-get install -y -q libevent-dev \
+        tmux \
         inotify-tools
 
 RUN useradd -m admin && echo "admin:admin" | chpasswd && adduser admin sudo
 RUN echo "admin ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
 USER admin
 WORKDIR /home/admin
-RUN wget https://deb.nodesource.com/setup_13.x && chmod +x ./setup_13.x && echo admin | sudo -S ./setup_13.x && \
+RUN wget https://deb.nodesource.com/setup_20.x && chmod +x ./setup_20.x && echo admin | sudo -S ./setup_20.x && \
         sudo apt-get install -y -q nodejs
 
-RUN git clone https://github.com/citelab/JAMScript 
+RUN git clone --branch master https://github.com/JeanKa25/JAMScript && cd JAMScript/tools && chmod 777 *
+
 
-RUN mkdir ~/.npm-global && npm config set prefix '~/.npm-global'
+WORKDIR /home/admin/JAMScript/deps
+RUN git clone https://github.com/intel/tinycbor
+WORKDIR /home/admin/JAMScript/deps/tinycbor
+RUN make
+RUN sudo make install
+
+WORKDIR /home/admin/JAMScript/deps/mujs2
+RUN make
+RUN sudo make install
 
 WORKDIR /home/admin/JAMScript
-RUN npm run link
-ENV PATH="/home/admin/.npm-global/bin:$PATH"
-RUN mkdir /home/admin/temp
-WORKDIR /home/admin/temp
+RUN npm install
+RUN sudo npm install zx -g
+
+WORKDIR /home/admin/JAMScript/lib/cside
+RUN make archive
+
+WORKDIR /home/admin
+RUN mkdir .jamruns
+WORKDIR /home/admin/.jamruns
+RUN ln -s /home/admin/JAMScript/lib/cside clib
+RUN ln -s /home/admin/JAMScript jamhome
+RUN ln -s /home/admin/JAMScript/lib/jside node_modules
+
+WORKDIR /home/admin
+RUN mkdir .npm-global
+RUN mkdir .npm-global/bin
+
+ENV PATH="$PATH:/home/admin/JAMScript/tools:/home/admin/.npm-global/bin"
+
+# Expose the SSH port
+EXPOSE 22
 
-CMD sudo chmod -R a+Xr /etc/avahi && sudo sed -i "s|rlimit-nproc=3|#rlimit-nproc=3 |g" /etc/avahi/avahi-daemon.conf && sudo chmod -R a+Xr /var/run && cd /var/run/ && sudo rm -rf dbus && sudo mkdir dbus && sudo dbus-daemon --system &&  sudo avahi-daemon
+# Start SSH service and keep the container running
+ENTRYPOINT ["bash", "-c", "sudo service ssh start && exec bash"]

tests/C2J_NoReturnResults/jt1-2.c

@@ -0,0 +1,25 @@
+jasync localme(int c, char* s) {
+    jarray int num[5] = {1, 2, 3, 4, 5};
+    while(1) {
+        // jsys.sleep(2000000);
+        //jsys.dontyield();
+	you(s, &num);
+	//        wprintf(L"############-->>> Hello  ME  %d... %s\n", c, s);
+    }
+}
+
+jasync localyou(int c, char* s) {
+    jarray int num[5] = {1, 2, 3, 4, 5};
+    while(1) {
+        jsys.sleep(1000000);
+        wprintf(L"############-->>> Hello YOU  %d, %s\n", c, s);
+        you(s, &num);
+    }
+}
+
+int main(int argc, char* argv[]) {
+    wprintf(L"folks we are printing with wide characters\n");
+    localme(FLT_MANT_DIG, "cxxxxyyyy");
+    //    localyou(hello(), "a-message-for-j: " BAZINGA);
+    return 0;
+}