hfs 0.48.0-alpha1 → 0.48.0-alpha2

package/admin/assets/{sha512-888f0eaa.js → sha512-136b5a7c.js}

@@ -1,4 +1,4 @@
-import{g as OF,c as UF}from"./index-12bfad23.js";function gF(sF,hF){for(var eF=0;eF<hF.length;eF++){const tF=hF[eF];if(typeof tF!="string"&&!Array.isArray(tF)){for(const w in tF)if(w!=="default"&&!(w in sF)){const lF=Object.getOwnPropertyDescriptor(tF,w);lF&&Object.defineProperty(sF,w,lF.get?lF:{enumerable:!0,get:()=>tF[w]})}}}return Object.freeze(Object.defineProperty(sF,Symbol.toStringTag,{value:"Module"}))}var dF={exports:{}};/*
+import{g as OF,c as UF}from"./index-344723f8.js";function gF(sF,hF){for(var eF=0;eF<hF.length;eF++){const tF=hF[eF];if(typeof tF!="string"&&!Array.isArray(tF)){for(const w in tF)if(w!=="default"&&!(w in sF)){const lF=Object.getOwnPropertyDescriptor(tF,w);lF&&Object.defineProperty(sF,w,lF.get?lF:{enumerable:!0,get:()=>tF[w]})}}}return Object.freeze(Object.defineProperty(sF,Symbol.toStringTag,{value:"Module"}))}var dF={exports:{}};/*
  * [js-sha512]{@link https://github.com/emn178/js-sha512}
  *
  * @version 0.8.0

package/admin/index.html

@@ -7,8 +7,8 @@
     <title>HFS Admin</title>
     
     <link rel="icon" type="image/svg+xml" href="/hfs-logo-icon.svg" />
-    <script type="module" crossorigin src="/assets/index-12bfad23.js"></script>
-    <link rel="stylesheet" href="/assets/index-5f04953d.css">
+    <script type="module" crossorigin src="/assets/index-344723f8.js"></script>
+    <link rel="stylesheet" href="/assets/index-1c2b890b.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "0.48.0-alpha1",
+  "version": "0.48.0-alpha2",
   "description": "HTTP File Server",
   "keywords": [
     "file server",

package/src/adminApis.js

@@ -165,10 +165,10 @@ exports.adminApis = {
             }
         });
         function parse(line) {
-            const m = /^(.+?) (.+?) (.+?) \[(.{11}):(.{14})] "(\w+) ([^"]+) HTTP\/\d.\d" (\d+) (-|\d+)/.exec(line);
+            const m = /^(.+?) (.+?) (.+?) \[(.{11}):(.{14})] "(\w+) ([^"]+) HTTP\/\d.\d" (\d+) (-|\d+) ?(.*)/.exec(line);
             if (!m)
                 return;
-            const [, ip, , user, date, time, method, uri, status, length] = m;
+            const [, ip, , user, date, time, method, uri, status, length, extra] = m;
             return {
                 ip,
                 user: user === '-' ? undefined : user,
@@ -177,6 +177,7 @@ exports.adminApis = {
                 uri,
                 status: Number(status),
                 length: length === '-' ? undefined : Number(length),
+                extra: (0, misc_1.tryJson)((0, misc_1.tryJson)(extra)) || undefined,
             };
         }
     },

package/src/api.net.js

@@ -28,7 +28,10 @@ client.getGateway = function getGatewayCaching() {
 };
 client.getGateway();
 exports.externalIp = Promise.resolve(''); // poll external ip
-(0, misc_1.repeat)(10 * misc_1.MINUTE, () => exports.externalIp = client.getPublicIp().catch(() => exports.externalIp));
+(0, misc_1.repeat)(10 * misc_1.MINUTE, () => {
+    const was = exports.externalIp;
+    exports.externalIp = client.getPublicIp().catch(() => was); //fallback to previous value
+});
 const getNatInfo = (0, misc_1.debounceAsync)(async () => {
     var _a, _b;
     const gettingIp = getPublicIp(); // don't wait, do it in parallel

package/src/const.js

@@ -38,7 +38,7 @@ exports.DEV = process.env.DEV || exports.argv.dev ? 'DEV' : '';
 exports.ORIGINAL_CWD = process.cwd();
 exports.HFS_STARTED = new Date();
 const PKG_PATH = (0, path_1.join)(__dirname, '..', 'package.json');
-exports.BUILD_TIMESTAMP = "2023-09-07T07:48:20.807Z";
+exports.BUILD_TIMESTAMP = "2023-09-07T17:51:10.938Z";
 const pkg = JSON.parse(fs.readFileSync(PKG_PATH, 'utf8'));
 exports.VERSION = pkg.version;
 exports.RUNNING_BETA = exports.VERSION.includes('-');

package/src/log.js

@@ -120,16 +120,19 @@ const logMw = async (ctx, next) => {
                     return;
             }
         }
-        const format = '%s - %s [%s] "%s %s HTTP/%s" %d %s\n'; // Apache's Common Log Format
+        const format = '%s - %s [%s] "%s %s HTTP/%s" %d %s %s\n'; // Apache's Common Log Format
         const a = now.toString().split(' ');
         const date = a[2] + '/' + a[1] + '/' + a[3] + ':' + a[4] + ' ' + ((_b = a[5]) === null || _b === void 0 ? void 0 : _b.slice(3));
         const user = (0, perm_1.getCurrentUsername)(ctx);
         const length = (_c = ctx.state.length) !== null && _c !== void 0 ? _c : ctx.length;
         const uri = ctx.originalUrl;
-        events_1.default.emit(logger.name, Object.assign(lodash_1.default.pick(ctx, ['ip', 'method', 'status']), { length, user, ts: now, uri }));
+        const extra = ctx.state.includesLastByte && ctx.vfsNode && { dl: 1 }
+            || ctx.state.uploadPath && { ul: ctx.state.uploadPath, size: ctx.state.uploadSize }
+            || undefined;
+        events_1.default.emit(logger.name, Object.assign(lodash_1.default.pick(ctx, ['ip', 'method', 'status']), { length, user, ts: now, uri, extra }));
         debounce(() => // once in a while we check if the file is still good (not deleted, etc), or we'll reopen it
          (0, promises_1.stat)(logger.path).catch(() => logger.reopen())); // async = smoother but we may lose some entries
-        stream.write(util.format(format, ctx.ip, user || '-', date, ctx.method, uri, ctx.req.httpVersion, ctx.status, (_d = length === null || length === void 0 ? void 0 : length.toString()) !== null && _d !== void 0 ? _d : '-'));
+        stream.write(util.format(format, ctx.ip, user || '-', date, ctx.method, uri, ctx.req.httpVersion, ctx.status, (_d = length === null || length === void 0 ? void 0 : length.toString()) !== null && _d !== void 0 ? _d : '-', extra ? JSON.stringify(JSON.stringify(extra)) : ''));
     });
 };
 exports.logMw = logMw;

package/src/serveFile.js

@@ -86,6 +86,7 @@ function getRange(ctx, totalSize) {
     ctx.set('Accept-Ranges', 'bytes');
     const { range } = ctx.request.header;
     if (!range) {
+        ctx.state.includesLastByte = true;
         ctx.response.length = totalSize;
         return;
     }

package/src/upload.js

@@ -117,8 +117,9 @@ function uploadWriter(base, path, ctx) {
         const conn = (0, connections_1.socket2connection)(ctx.socket);
         if (!conn)
             return () => { };
-        ctx.state.uploadPath = ctx.path + path;
         const opTotal = reqSize + resume;
+        ctx.state.uploadPath = ctx.path + path;
+        ctx.state.uploadSize = opTotal;
         (0, connections_1.updateConnection)(conn, { ctx, op: 'upload', opTotal, opOffset: resume / opTotal });
         const h = setInterval(() => {
             const now = Date.now();

package/admin/assets/index-5f04953d.css

@@ -1 +0,0 @@
-:root{height:100dvh}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;height:100vh;background:#000}#root{min-height:100%;display:flex}main{word-break:break-word}code{font-family:source-code-pro,Menlo,Monaco,Consolas,Courier New,monospace}.MuiTreeItem-content{box-sizing:border-box}.MuiDataGrid-columnHeaders{background-color:#8882}ol,ul{margin-top:.2em;padding-left:1.5em}.dialog-alert .MuiDialogContent-root{max-width:45em;padding:.5em 1em}.animated-dashed-line{width:100%;height:2px;background-image:linear-gradient(to right,currentColor 50%,transparent 50%);background-size:10px 100%;animation:animate-dash 1s alternate linear infinite}@keyframes animate-dash{to{background-position:20px 0}}