Version 3 (#95)

This is a complete rewrite using Typescript built on version 3 of `ogr2ogr`. The Ogre API and CLI remains mostly the same with the following notable changes:

 - BREAKING: Removed support for Node 10
 - BREAKING: Using ogr2ogr version 3 as a backend. It may behave differently for some file types.
 - The CLI can now optionally take a `limit` parameter specifying the upload/body limit in bytes.
 - The UI now has the ability to input a `format`.

Author: wavded

.eslintrc

@@ -1,16 +1,23 @@
 {
   "root": true,
-  "extends": ["eslint:recommended"],
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "prettier"
+  ],
   "env": {
     "node": true,
     "es6": true
   },
   "parserOptions": {
-    "ecmaVersion": 8
+    "sourceType": "module",
+    "project": "./tsconfig.json",
+    "ecmaVersion": 2019
   },
   "rules": {
-    "no-console": 0,
-    "no-var": 2,
-    "require-atomic-updates": 0
+    "prefer-const": 0,
+    "@typescript-eslint/no-unused-vars": ["error", {"argsIgnorePattern": "^_"}]
   }
 }

.github/workflows/build.yml

@@ -7,17 +7,18 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    container:
+      image: osgeo/gdal:ubuntu-small-latest
     strategy:
       matrix:
-        node: ['10', '12', '14']
+        node: ['12', '14']
     name: Node v${{ matrix.node }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
-      - run: sudo apt-get install gdal-bin
-      - run: yarn install
-      - run: yarn fmt-check
-      - run: yarn lint
-      - run: yarn test
+      - run: npm install
+      - run: npm run fmt-check
+      - run: npm run lint
+      - run: npm run test

.gitignore

@@ -1,6 +1,8 @@
 node_modules
 npm_debug.log
+ogr_*
 .DS_Store
-.tern-port
-yarn-error.log
+coverage
+.nyc_output
 yarn.lock
+dist

.npmignore

@@ -0,0 +1 @@
+testdata

changelog.md

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-const ogre = require('../')
+import Ogre from './'
+import {version} from './package.json'
 
 let args = process.argv.slice(2)
-let version = require('../package.json').version
 
 let usage =
   '' +
@@ -12,10 +12,12 @@ let usage =
   ' -h, --help      help\n' +
   ' -p, --port      port number (default 3000)\n' +
   ' -v, --version   version number\n' +
-  ' -t, --timeout   timeout before ogre kills a job in ms (default 15000)\n'
+  ' -t, --timeout   timeout before ogre kills a job in ms (default 15000)\n' +
+  ' -l, --limit     byte limit for uploads (default 50000000)\n'
 
 let port = 3000
-let timeout
+let timeout = 15000
+let limit = 50000000
 
 let arg
 while (args.length) {
@@ -35,17 +37,23 @@ while (args.length) {
 
     case '-p':
     case '--port':
-      port = args.shift()
+      port = Number(args.shift())
       break
 
     case '-t':
     case '--timeout':
       timeout = Number(args.shift())
       break
 
+    case '-l':
+    case '--limit':
+      limit = Number(args.shift())
+      break
+
     default:
   }
 }
 
-ogre.createServer({timeout: timeout}).listen(port)
-console.log('Ogre listening on port', port)
+let ogre = new Ogre({port, timeout, limit})
+ogre.start()
+console.log('Ogre (%s) ready. Port %d', version, port)