Update

build/main.js

@@ -14,9 +14,9 @@ var querystring = require('querystring');
 var url = require('url');
 var http = require('http');
 var crypto = require('crypto');
+var os = require('os');
 var constants$1 = require('constants');
 var https = require('https');
-var os = require('os');
 var assert = require('assert');
 var module$1 = require('module');
 var v8$1 = require('v8');
@@ -58,9 +58,9 @@ var querystring__default = /*#__PURE__*/_interopDefaultLegacy(querystring);
 var url__default = /*#__PURE__*/_interopDefaultLegacy(url);
 var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 var crypto__default = /*#__PURE__*/_interopDefaultLegacy(crypto);
+var os__default = /*#__PURE__*/_interopDefaultLegacy(os);
 var constants__default = /*#__PURE__*/_interopDefaultLegacy(constants$1);
 var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
-var os__default = /*#__PURE__*/_interopDefaultLegacy(os);
 var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert);
 var module__default = /*#__PURE__*/_interopDefaultLegacy(module$1);
 var v8__default = /*#__PURE__*/_interopDefaultLegacy(v8$1);
@@ -222004,41 +222004,7 @@ async function validateVersion(req, res, next) {
 
 var validatePackageVersion = asyncHandler(validateVersion);
 
-function createApp(callback) {
+const renderFolderBrowser = async (req, res, next) => {
-  const app = express$1();
-  callback(app);
-  return app;
-}
-
-function createServer() {
-  return createApp(app => {
-    app.disable('x-powered-by');
-    app.enable('trust proxy');
-    app.enable('strict routing');
-
-    app.use(lib());
-    app.use(express$1.static('public', { maxAge: '1y' }));
-
-    app.use(requestLog);
-
-    app.use(redirectLegacyURLs);
-
-    app.all('/', (req, res) => {
-      res.send("To infinity and beyond!");
-    });
-
-    app.use(
-      '/browse',
-      createApp(app => {
-        app.enable('strict routing');
-
-        app.get(
-          '*/',
-          noQuery(),
-          validatePackagePathname,
-          validatePackageName,
-          validatePackageVersion,
-          async (req, res, next) => {
 
   res.set({
     'Cache-Control': 'public, max-age=14400', // 4 hours
@@ -222142,21 +222108,65 @@ function createServer() {
     </table>
     <hr />
     <address><%= package %> </address>
-                <address>186526 Edge/1.20.1</address>
+    <address>186526 NPM Edge Network #d9e588d</address>
 </body>
 
 </html>`, Object.assign({ package: `${req.packageName}@${req.packageVersion}` }, await getMetadataMoreEasier(req)), { async: true });
   res.send(html);
+};
+
+function createApp(callback) {
+  const app = express$1();
+  callback(app);
+  return app;
+}
+
+const hostname = os__default['default'].hostname();
+
+function createServer() {
+  return createApp(app => {
+    app.disable('x-powered-by');
+    app.enable('trust proxy');
+    app.enable('strict routing');
+
+    app.use(lib());
+    app.use(express$1.static('public', { maxAge: '1y' }));
+
+    app.use((req, res, next) => {
+      res.set({ 'x-delivery-by': hostname ,
+    'timing-allow-origin': '*' });
+      next();
     });
 
-        app.get(
+    app.use(requestLog);
-          '*',
+
-          (req,res,next) => {
+    app.use(redirectLegacyURLs);
-            res.redirect(req.path.replace("/browser",""));
+
-          }
+    app.all('/', (req, res) => {
-        );
+      res.send("To infinity and beyond!");
-      })
+    });
-    );
+
+    // app.use(
+    //   '/browse',
+    //   createApp(app => {
+    //     app.enable('strict routing');
+
+    //     app.get(
+    //       '*/',
+    //       noQuery(),
+    //       validatePackagePathname,
+    //       validatePackageName,
+    //       validatePackageVersion,
+    //       renderFolderBrowser,
+    //     );
+    //     app.get(
+    //       '*',
+    //       (req, res, next) => {
+    //         res.redirect(req.path.replace("/browser", ""));
+    //       }
+    //     );
+    //   })
+    // );
 
     // We need to route in this weird way because Express
     // doesn't have a way to route based on query params.
@@ -222217,10 +222227,12 @@ function createServer() {
       }
     });
 
-    // Send old */ requests to the new /browse UI.
+    app.get('*/', noQuery(),
-    app.get('*/', (req, res) => {
+      validatePackagePathname,
-      res.redirect(302, '/browse' + req.url);
+      validatePackageName,
-    });
+      validatePackageVersion,
+      renderFolderBrowser
+    );
 
     app.get(
       '*',

modules/createServer.js

@@ -1,6 +1,7 @@
 import cors from 'cors';
 import express from 'express';
 import ejs from 'ejs';
+import os from "os";
 
 import serveDirectoryMetadata, { getMetadataMoreEasier } from './actions/serveDirectoryMetadata.js';
 import serveFileMetadata from './actions/serveFileMetadata.js';
@@ -121,7 +122,7 @@ const renderFolderBrowser = async (req, res, next) => {
     </table>
     <hr />
     <address><%= package %> </address>
-    <address>186526 NPM Edge Network #010fed1</address>
+    <address>186526 NPM Edge Network #d9e588d</address>
 </body>
 
 </html>`, Object.assign({ package: `${req.packageName}@${req.packageVersion}` }, await getMetadataMoreEasier(req, res)), { async: true });
@@ -134,6 +135,8 @@ function createApp(callback) {
   return app;
 }
 
+const hostname = os.hostname();
+
 export default function createServer() {
   return createApp(app => {
     app.disable('x-powered-by');
@@ -143,6 +146,16 @@ export default function createServer() {
     app.use(cors());
     app.use(express.static('public', { maxAge: '1y' }));
 
+    app.use((req, res, next) => {
+      res.set({
+        'x-delivery-by': hostname,
+        'timing-allow-origin': '*',
+        'x-powered-by': '186526 NPM Edge Network',
+        'x-version': 'd9e588d'
+      });
+      next();
+    })
+
     app.use(requestLog);
 
     app.use(redirectLegacyURLs);
@@ -151,27 +164,27 @@ export default function createServer() {
       res.send("To infinity and beyond!");
     })
 
-    app.use(
+    // app.use(
-      '/browse',
+    //   '/browse',
-      createApp(app => {
+    //   createApp(app => {
-        app.enable('strict routing');
+    //     app.enable('strict routing');
 
-        app.get(
+    //     app.get(
-          '*/',
+    //       '*/',
-          noQuery(),
+    //       noQuery(),
-          validatePackagePathname,
+    //       validatePackagePathname,
-          validatePackageName,
+    //       validatePackageName,
-          validatePackageVersion,
+    //       validatePackageVersion,
-          renderFolderBrowser,
+    //       renderFolderBrowser,
-        );
+    //     );
-        app.get(
+    //     app.get(
-          '*',
+    //       '*',
-          (req, res, next) => {
+    //       (req, res, next) => {
-            res.redirect(req.path.replace("/browser", ""));
+    //         res.redirect(req.path.replace("/browser", ""));
-          }
+    //       }
-        );
+    //     );
-      })
+    //   })
-    );
+    // );
 
     // We need to route in this weird way because Express
     // doesn't have a way to route based on query params.
@@ -232,7 +245,6 @@ export default function createServer() {
       }
     });
 
-    // Send old */ requests to the new /browse UI.
     app.get('*/', noQuery(),
       validatePackagePathname,
       validatePackageName,

package.json

@@ -1,10 +1,9 @@
 {
   "name": "unpkg",
   "private": true,
-  "type":"module",
   "description": "The CDN for everything on npm",
   "scripts": {
-    "build": "rollup -c",
+    "build": "rollup -c rollup.config.cjs",
     "clean": "git clean -e '!/.env' -fdX .",
     "lint": "eslint .",
     "serve": "nodemon -w server.js server.js",