Modernize project tooling

.eslintrc.json

@@ -0,0 +1,12 @@
+{
+  "env": {
+    "node": true,
+    "es2021": true,
+    "jest": true
+  },
+  "extends": ["eslint:recommended", "plugin:prettier/recommended"],
+  "parserOptions": {
+    "ecmaVersion": "latest"
+  },
+  "rules": {}
+}

.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+      - run: npm install
+      - run: npm run lint
+      - run: npm run format -- --check
+      - run: npm test

.gitignore

@@ -1,4 +1,5 @@
 *~
+package-lock.json
 node_modules
 ixp.all.js
 zz.js

.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all"
+}

README.md

@@ -1,31 +1,22 @@
 # 9pJSON
 
-A new Javascript implementation of the 9p protocol.
-Unlike most other implementations this one decouples the marshalling.
-In this way we can put classic 9p2000 packets on the wire,
-or JSON (9pJSON). Use as a module for node.js, or in a web page 
-(ixp.all.js).
+[![CI](https://github.com/rsbohn/9pJSON/actions/workflows/ci.yml/badge.svg)](https://github.com/rsbohn/9pJSON/actions/workflows/ci.yml)
 
-The node.js test suite runs with grunt. Please npm install -g 'grunt-cli' first,
-then use npm install in this directory. It should install a current version of
-the actual 'grunt' and associated modules.
+A new Javascript implementation of the 9p protocol. Unlike most other implementations this one decouples the marshalling. In this way we can put classic 9p2000 packets on the wire, or JSON (9pJSON). Use as a module for node.js, or in a web page (ixp.all.js).
 
-For 'over-the-wire' calls you need to build a packet according to the formats
-in ixp.js:packets[] and send it to service.answer(). You'll get a response packet
-(as a javascript object). Within your program you can make direct protocol 
-function calls, "service.Tattach({...})" for example.
+### Node.js
 
-## Usage
+Install dependencies with `npm install`.
+Run `npm run lint` to lint the code, `npm run format` to apply formatting, and `npm test` to run the Jest suite.
 
-### Browser
+For 'over-the-wire' calls you need to build a packet according to the formats in ixp.js:packets[] and send it to service.answer(). You'll get a response packet (as a javascript object). Within your program you can make direct protocol function calls, `service.Tattach({...})` for example.
 
-First run `grunt concat` to build 9pJSON.all.js, then include it in your .html file.
-See proto.html for more information.
+## Usage
 
+### Browser
+Include dist/ixp.all.js in your HTML file. See proto.html for more information.
 ### Node.js
-
-Require 9pJSON, then call .Server() or .Client() as needed. Servers will build a file
-tree and then respond to requests by calling .answer(packet).
+Require 9pJSON, then call .Server() or .Client() as needed. Servers will build a file tree and then respond to requests by calling .answer(packet).
 
 ## Contributing
 
@@ -35,15 +26,6 @@ Porting any of the following:
 * factotum
 * secret store
 
-To contribute please fork this repository, 
-make sure all the tests pass (including jshint),
-then submit pull requests. 
-Code aligned with the project direction 
-is more likely to be merged 
-into the master branch.
-Unlikely to be accepted: overly complex code,
-patches that change multiple features,
-patches without tests.
-
-Much of this code is based on https://github.com/aiju/jsdrawterm. 
-Most of this code was developed using Acme and a 'test first (mostly)' process.
+To contribute please fork this repository, make sure the linter, formatter and test suite pass, then submit pull requests. Code aligned with the project direction is more likely to be merged into the master branch. Unlikely to be accepted: overly complex code, patches that change multiple features, patches without tests.
+
+Much of this code is based on https://github.com/aiju/jsdrawterm. Most of this code was developed using Acme and a 'test first (mostly)' process.

client.js

@@ -1,9 +1,15 @@
 // attach, walk, open, read, close
-exports.attach = function(service, chain){
-  var myFid = Math.floor(Math.random()*1024)+1024;
-  var request = {type:service.msgtype.Tattach, tag:3000, fid:myFid};
+exports.attach = function (service, chain) {
+  var myFid = Math.floor(Math.random() * 1024) + 1024;
+  var request = { type: service.msgtype.Tattach, tag: 3000, fid: myFid };
   var reply = service.answer(request);
   chain(request, reply);
-  reply = service.answer({type:service.msgtype.Tclunk, tag:3000, fid:myFid});
-  if (reply.type === service.msgtype.Rerror) { throw reply.ename; }
-};
+  reply = service.answer({
+    type: service.msgtype.Tclunk,
+    tag: 3000,
+    fid: myFid,
+  });
+  if (reply.type === service.msgtype.Rerror) {
+    throw reply.ename;
+  }
+};

dist/drawchart.js

@@ -1,50 +1,55 @@
-(function(exports){
-var canvas = document.getElementById('catclock');
+(function (exports) {
+  var canvas = document.getElementById('catclock');
 
-exports.points = [12,15,18,21,24];
+  exports.points = [12, 15, 18, 21, 24];
 
-exports.add = function(x){
-  exports.points.push(x);
-  while (exports.points.length > canvas.height) {
-    exports.points.shift();
-  }
-}
+  exports.add = function (x) {
+    exports.points.push(x);
+    while (exports.points.length > canvas.height) {
+      exports.points.shift();
+    }
+  };
 
-var drawBox = function(cx, y) {
-  var x = 1;
-  var g = exports.points.length;
-  if (y < g) { x = exports.points[g-y];}
-  var mid = canvas.width/2;
-  cx.moveTo(mid-x,y);
-  cx.lineTo(mid+x, y);
-  cx.stroke();
-}
+  var drawBox = function (cx, y) {
+    var x = 1;
+    var g = exports.points.length;
+    if (y < g) {
+      x = exports.points[g - y];
+    }
+    var mid = canvas.width / 2;
+    cx.moveTo(mid - x, y);
+    cx.lineTo(mid + x, y);
+    cx.stroke();
+  };
 
-exports.update = function(){
-  var cx = canvas.getContext('2d');
-  var height = canvas.height;
-  canvas.height=canvas.height;
-  for (x=0; x<height;x++) {
-    drawBox(cx, height-x);
-  }
-}
+  exports.update = function () {
+    var cx = canvas.getContext('2d');
+    var height = canvas.height;
+    canvas.height = canvas.height;
+    for (x = 0; x < height; x++) {
+      drawBox(cx, height - x);
+    }
+  };
 
-exports.append = function(s){
-  var max = 8
-  for (x in s) {
-    if (x < max) { exports.add(s.charCodeAt(x));}
-    else { break; }
-  }
-}
+  exports.append = function (s) {
+    var max = 8;
+    for (x in s) {
+      if (x < max) {
+        exports.add(s.charCodeAt(x));
+      } else {
+        break;
+      }
+    }
+  };
 
-exports.update();
-})(typeof(exports)==='undefined' ? this.drawchart={} : exports);
+  exports.update();
+})(typeof exports === 'undefined' ? (this.drawchart = {}) : exports);
 
 function CanvasCtrl($scope, $timeout) {
   var promise;
-  $scope.tick = function(){
+  $scope.tick = function () {
     drawchart.update();
     promise = $timeout($scope.tick, 1000);
-  }
+  };
   promise = $scope.tick();
-}
+}

index.js

@@ -1,21 +1,23 @@
-var _util = require("./ixputil");
-var _ixp = require("./ixp");
+var _util = require('./ixputil');
+var _ixp = require('./ixp');
 _ixp.set_util(_util);
 
-exports.Server = function(){
+exports.Server = function () {
   var s = _ixp.Service;
   s.tree = _ixp.mkroot();
   return s;
 };
 
-exports.Client = function(){
+exports.Client = function () {
   var c = {};
   return c;
 };
 
 //who uses ixp?
 exports.ixp = {
-  tree:{
-    mkfile: function(s){throw new Error("bang! "+s);}
-  }
-};
+  tree: {
+    mkfile: function (s) {
+      throw new Error('bang! ' + s);
+    },
+  },
+};