Convert to ES module

app.js

@@ -1,9 +1,8 @@
-const express = require('express');
-const path = require('path');
-const logger = require('morgan');
-const cors = require('cors');
-const createError = require('http-errors');
-const cdnRouter = require('./routes/cdn');
+import express from 'express';
+import logger from 'morgan';
+import cors from 'cors';
+import createError from 'http-errors';
+import cdnRouter from './routes/cdn.js';
 const app = express();
 
 app.use(cors())
@@ -23,4 +22,4 @@ app.use(function(err, req, res, next) {
   res.type("text/plain").send(err.message || "CDN lookup error");
 });
 
-module.exports = app;
+export default app;

bin/www

@@ -1,11 +1,7 @@
 #!/usr/bin/env node
 
-/**
- * Module dependencies.
- */
-
-var app = require('../app');
-var http = require('http');
+import app from '../app.js';
+import http from 'node:http';
 
 /**
  * Get port from environment and store in Express.

package.json

@@ -1,6 +1,7 @@
 {
   "name": "cdn-app",
   "version": "0.0.1",
+  "type": "module",
   "private": true,
   "scripts": {
     "start": "node ./bin/www"

routes/cdn.js

@@ -1,17 +1,18 @@
-const mongodb = require('mongodb');
-const express = require('express');
-const gunzip = require('gunzip-maybe');
-const tar = require('tar-stream');
+import mongodb from 'mongodb';
+import express from 'express';
+import gunzip from 'gunzip-maybe';
+import tar from 'tar-stream';
+import createError from 'http-errors';
+
 const router = express.Router();
-const createError = require('http-errors');
 const HOST = process.env.CRANLIKE_MONGODB_SERVER || '127.0.0.1';
 const PORT = process.env.CRANLIKE_MONGODB_PORT || 27017;
 const USER = process.env.CRANLIKE_MONGODB_USERNAME || 'root';
 const PASS = process.env.CRANLIKE_MONGODB_PASSWORD;
 const AUTH = PASS ? (USER + ':' + PASS + "@") : "";
 const URL = 'mongodb://' + AUTH + HOST + ':' + PORT;
 const connection = mongodb.MongoClient.connect(URL);
-var bucket;
+let bucket;
 
 function tar_index_files(input){
   let files = [];
@@ -64,11 +65,7 @@ connection.then(function(client) {
   bucket = new mongodb.GridFSBucket(db, {bucketName: 'files'});
 });
 
-stream_file = function(x){
-  return bucket.openDownloadStream(x['_id']);
-}
-
-send_from_bucket = function(hash, file, res){
+function send_from_bucket(hash, file, res){
   return bucket.find({_id: hash}, {limit:1}).next().then(function(pkg){
     if(!pkg){
       return res.status(410).type("text/plain").send(`File ${hash} not available (anymore)`);
@@ -124,4 +121,4 @@ router.get("/", function(req, res, next) {
   next(createError(400, "Invalid CDN req: " + req.url));
 });
 
-module.exports = router;
+export default router;