js-dos 8.1.4 → 8.1.6

package/src/sockdrive/README.md

@@ -1,45 +0,0 @@
-# sockdrive client api sdk
-
-# js
-
-Plain js api ready to use in browser.
-
-Building:
-
-```js
-cd js
-yarn
-yarn run webpack
-```
-
-Js api is in `js/dist/sockdriveFat.js`. The api is node-like fs api.
-
-Testing:
-
-1. Install dosfstools
-2. cd js/dist/test && make-img-linux.sh
-3. Serve dist folder
-4. Open test.html in browser to run tests.
-
-## 3rdparty code
-
-### LRU cache
-
-`src/sockdrive/lru.js` is from https://github.com/rsms/js-lru
-Licensed under MIT. Copyright (c) 2010 Rasmus Andersson <http://hunch.se/>
-
-### fatfs (fork)
-
-`src/fatfs` is a fork of https://github.com/natevw/fatfs
-
-License information:
-
-```
-© 2014 Nathan Vander Wilt.
-Funding for this work was provided by Technical Machine, Inc.
-
-Reuse under your choice of:
-
-* BSD-2-Clause
-* Apache 2.0
-```

package/src/sockdrive/include/sockdrive.h

@@ -1,23 +0,0 @@
-//
-// Created by caiii on 30.08.2023.
-//
-
-#ifndef SOCKDRIVE_H
-#define SOCKDRIVE_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-extern "C" {
-    size_t sockdrive_open(const char* url, const char* owner, const char* name, const char* token);
-    uint8_t sockdrive_read(size_t handle, uint32_t sector, uint8_t * buffer);
-    uint8_t sockdrive_write(size_t handle, uint32_t sector, uint8_t* buffer);
-    uint32_t sockdrive_size(size_t handle);
-    uint32_t sockdrive_heads(size_t handle);
-    uint32_t sockdrive_sectors(size_t handle);
-    uint32_t sockdrive_cylinders(size_t handle);
-    uint32_t sockdrive_sector_size(size_t handle);
-    void sockdrive_close(size_t handle);
-}
-
-#endif //SOCKDRIVE_H

package/src/sockdrive/js/.eslintrc.json

@@ -1,43 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": [
-        "google"
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": 12,
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-        "object-curly-spacing": [
-            "error",
-            "always"
-        ],
-        "require-jsdoc": "off",
-        "quotes": [
-            "error",
-            "double"
-        ],
-        "indent": [
-            "error",
-            4,
-            {
-                "SwitchCase": 1,
-                "FunctionDeclaration": {
-                    "parameters": "first"
-                }
-            }
-        ],
-        "max-len": [
-            "error",
-            120
-        ]
-    },
-    "ignorePatterns": ["dist/**/*"]
-}

package/src/sockdrive/js/package.json

@@ -1,29 +0,0 @@
-{
-  "name": "sockdrive-asyncify",
-  "version": "1.0.0",
-  "description": "The sockdrive support for emscripten",
-  "license": "GPLv3",
-  "private": true,
-  "dependencies": {
-    "buffer": "^6.0.3",
-    "fifolock": "^1.0.0",
-    "stream-browserify": "^3.0.0",
-    "struct-fu": "^1.2.1",
-    "typedarray-to-buffer": "^4.0.0",
-    "xok": "^1.0.0"
-  },
-  "devDependencies": {
-    "@types/chai": "^4.3.6",
-    "@types/mocha": "^10.0.1",
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
-    "@typescript-eslint/parser": "^6.7.2",
-    "eslint": "^8.48.0",
-    "eslint-config-google": "^0.14.0",
-    "eslint-webpack-plugin": "^4.0.1",
-    "process": "^0.11.10",
-    "ts-loader": "^9.4.4",
-    "typescript": "^5.2.2",
-    "webpack": "^5.88.2",
-    "webpack-cli": "^5.1.4"
-  }
-}

package/src/sockdrive/js/src/fatfs/chains.js

@@ -1,318 +0,0 @@
-const S = require("./structs.js");
-const _ = require("./helpers.js");
-
-function _baseChain(vol) {
-    const chain = {};
-
-    chain.sectorSize = vol._sectorSize;
-
-    function posFromOffset(off) {
-        const secSize = chain.sectorSize;
-        const offset = off % secSize;
-        const sector = (off - offset) / secSize;
-        return { sector: sector, offset: offset };
-    }
-
-    chain.cacheAdvice = "NORMAL";
-    chain._vol_readSectors = vol._readSectors.bind(vol);
-    chain._vol_writeSectors = vol._writeSectors.bind(vol);
-
-    // cb(error, bytesRead, buffer)
-    chain.readFromPosition = function(targetPos, buffer, cb) {
-        if (typeof targetPos === "number") targetPos = posFromOffset(targetPos);
-        if (typeof buffer === "number") buffer = _.allocBuffer(buffer);
-        /* NOTE: to keep our contract with the volume driver, we need to read on _full_ sector boundaries!
-                 So we divide the read into [up to] three parts: {preface, main, trailer}
-                 This is kind of unfortunate, but in practice should often still be reasonably efficient. */
-        if (targetPos.offset) {
-            chain.readSectors(targetPos.sector, _.allocBuffer(chain.sectorSize), function(e, d) {
-                if (e || !d) cb(e, 0, buffer);
-                else { // copy preface into `buffer`
-                    const dBeg = targetPos.offset;
-                    const dEnd = dBeg + buffer.length;
-                    d.copy(buffer, 0, dBeg, dEnd);
-                    if (dEnd > d.length) readMain();
-                    else cb(null, buffer.length, buffer);
-                }
-            });
-        } else readMain();
-        function readMain() {
-            const prefaceLen = targetPos.offset && (chain.sectorSize - targetPos.offset);
-            const trailerLen = (buffer.length - prefaceLen) % chain.sectorSize;
-            const mainSector = (prefaceLen) ? targetPos.sector + 1 : targetPos.sector;
-            const mainBuffer = (trailerLen) ? buffer.slice(prefaceLen, -trailerLen) : buffer.slice(prefaceLen);
-            if (mainBuffer.length) {
-                chain.readSectors(mainSector, mainBuffer, function(e, d) {
-                    if (e || !d) cb(e, prefaceLen, buffer);
-                    else if (!trailerLen) cb(null, buffer.length, buffer);
-                    else readTrailer();
-                });
-            } else readTrailer();
-            function readTrailer() {
-                const trailerSector = mainSector + (mainBuffer.length / chain.sectorSize);
-                chain.readSectors(trailerSector, _.allocBuffer(chain.sectorSize), function(e, d) {
-                    if (e || !d) cb(e, buffer.length-trailerLen, buffer);
-                    else {
-                        d.copy(buffer, buffer.length-trailerLen, 0, trailerLen);
-                        cb(null, buffer.length, buffer);
-                    }
-                });
-            }
-        }
-    };
-
-    // cb(error)
-    chain.writeToPosition = function(targetPos, data, cb) {
-        _.log(_.log.DBG, "WRITING", data.length, "bytes at", targetPos, "in", this.toJSON(), data);
-        if (typeof targetPos === "number") targetPos = posFromOffset(targetPos);
-
-        const prefaceBuffer = (targetPos.offset) ? data.slice(0, chain.sectorSize-targetPos.offset) : null;
-        if (prefaceBuffer) {
-            _modifySector(targetPos.sector, targetPos.offset, prefaceBuffer, function(e) {
-                if (e) cb(e);
-                else if (prefaceBuffer.length < data.length) writeMain();
-                else cb();
-            });
-        } else writeMain();
-        function writeMain() {
-            const prefaceLen = (prefaceBuffer) ? prefaceBuffer.length : 0;
-            const trailerLen = (data.length - prefaceLen) % chain.sectorSize;
-            const mainSector = (prefaceLen) ? targetPos.sector + 1 : targetPos.sector;
-            const mainBuffer = (trailerLen) ? data.slice(prefaceLen, -trailerLen) : data.slice(prefaceLen);
-            if (mainBuffer.length) {
-                chain.writeSectors(mainSector, mainBuffer, function(e) {
-                    if (e) cb(e);
-                    else if (!trailerLen) cb();
-                    else writeTrailer();
-                });
-            } else writeTrailer();
-            function writeTrailer() {
-                const trailerSector = mainSector + (mainBuffer.length / chain.sectorSize);
-                const trailerBuffer = data.slice(data.length-trailerLen); // WORKAROUND: https://github.com/tessel/runtime/issues/721
-                _modifySector(trailerSector, 0, trailerBuffer, cb);
-            }
-        }
-        function _modifySector(sec, off, data, cb) {
-            chain.readSectors(sec, _.allocBuffer(chain.sectorSize), function(e, orig) {
-                if (e) return cb(e);
-                orig || (orig = _.allocBuffer(chain.sectorSize, 0));
-                data.copy(orig, off);
-                chain.writeSectors(sec, orig, cb);
-            });
-        }
-    };
-
-    return chain;
-};
-
-
-exports.clusterChain = function(vol, firstCluster, _parent) {
-    const chain = _baseChain(vol);
-    const cache = [firstCluster];
-
-    chain.firstCluster = firstCluster;
-
-    function _cacheIsComplete() {
-        return cache[cache.length-1] === "eof";
-    }
-
-    function extendCacheToInclude(i, cb) { // NOTE: may `cb()` before returning!
-        if (i < cache.length) cb(null, cache[i]);
-        else if (_cacheIsComplete()) cb(null, "eof");
-        else {
-            vol.fetchFromFAT(cache[cache.length-1], function(e, d) {
-                if (e) cb(e);
-                else if (typeof d === "string" && d !== "eof") cb(S.err.IO());
-                else {
-                    cache.push(d);
-                    extendCacheToInclude(i, cb);
-                }
-            });
-        }
-    }
-
-    function expandChainToLength(clusterCount, cb) {
-        if (!_cacheIsComplete()) throw Error("Must be called only when cache is complete!");
-        else cache.pop(); // remove 'eof' entry until finished
-
-        function addCluster(clustersNeeded, lastCluster) {
-            if (!clustersNeeded) cache.push("eof"), cb();
-            else {
-                vol.allocateInFAT(lastCluster, function(e, newCluster) {
-                    if (e) cb(e);
-                    else {
-                        vol.storeToFAT(lastCluster, newCluster, function(e) {
-                            if (e) return cb(e);
-
-                            cache.push(newCluster);
-                            addCluster(clustersNeeded-1, newCluster);
-                        });
-                    }
-                });
-            }
-        }
-        addCluster(clusterCount - cache.length, cache[cache.length - 1]);
-    }
-
-    function shrinkChainToLength(clusterCount, cb) {
-        if (!_cacheIsComplete()) throw Error("Must be called only when cache is complete!");
-        else cache.pop(); // remove 'eof' entry until finished
-
-        function removeClusters(count, cb) {
-            if (!count) cache.push("eof"), cb();
-            else {
-                vol.storeToFAT(cache.pop(), "free", function(e) {
-                    if (e) cb(e);
-                    else removeClusters(count - 1, cb);
-                });
-            }
-        }
-        // NOTE: for now, we don't remove the firstCluster ourselves; we should though!
-        if (clusterCount) removeClusters(cache.length - clusterCount, cb);
-        else removeClusters(cache.length - 1, cb);
-    }
-
-    // [{firstSector,numSectors},{firstSector,numSectors},…]
-    function determineSectorGroups(sectorIdx, numSectors, alloc, cb) {
-        let sectorOffset = sectorIdx % vol._sectorsPerCluster;
-        const clusterIdx = (sectorIdx - sectorOffset) / vol._sectorsPerCluster;
-        const numClusters = Math.ceil((numSectors + sectorOffset) / vol._sectorsPerCluster);
-        const chainLength = clusterIdx + numClusters;
-        extendCacheToInclude(chainLength-1, function(e, c) {
-            if (e) cb(e);
-            else if (c === "eof" && alloc) {
-                expandChainToLength(chainLength, function(e) {
-                    if (e) cb(e);
-                    else _determineSectorGroups();
-                });
-            } else _determineSectorGroups();
-        });
-        function _determineSectorGroups() {
-            // …now we have a complete cache
-            const groups = [];
-            let _group = null;
-            for (var i = clusterIdx; i < chainLength; ++i) {
-                const c = (i < cache.length) ? cache[i] : "eof";
-                if (c === "eof") break;
-                else if (_group && c !== _group._nextCluster) {
-                    groups.push(_group);
-                    _group = null;
-                }
-                if (!_group) {
-                    _group = {
-                        _nextCluster: c+1,
-                        firstSector: vol._firstSectorOfCluster(c) + sectorOffset,
-                        numSectors: vol._sectorsPerCluster - sectorOffset,
-                    };
-                } else {
-                    _group._nextCluster += 1;
-                    _group.numSectors += vol._sectorsPerCluster;
-                }
-                sectorOffset = 0; // only first group is offset
-            }
-            if (_group) groups.push(_group);
-            cb(null, groups, i === chainLength);
-        }
-    }
-
-    chain.readSectors = function(i, dest, cb) {
-        let groupOffset = 0; let groupsPending;
-        determineSectorGroups(i, dest.length / chain.sectorSize, false, function(e, groups, complete) {
-            if (e) cb(e);
-            else if (!complete) groupsPending = -1, _pastEOF(cb);
-            else if ((groupsPending = groups.length)) {
-                const process = (group) => new Promise((resolve) => {
-                    const groupLength = group.numSectors * chain.sectorSize;
-                    const groupBuffer = dest.slice(groupOffset, groupOffset += groupLength);
-                    chain._vol_readSectors(group.firstSector, groupBuffer, function(e, d) {
-                        if (e && groupsPending !== -1) groupsPending = -1, cb(e);
-                        else if (--groupsPending === 0) cb(null, dest);
-                        resolve();
-                    });
-                });
-
-                (async () => {
-                    for (const group of groups) {
-                        await process(group);
-                    }
-                })().catch((e) => cb(e));
-            } else cb(null, dest); // 0-length destination case
-        });
-    };
-
-    // TODO: does this handle NOSPC condition?
-    chain.writeSectors = function(i, data, cb) {
-        let groupOffset = 0; let groupsPending;
-        determineSectorGroups(i, data.length / chain.sectorSize, true, function(e, groups) {
-            if (e) cb(e);
-            else if ((groupsPending = groups.length)) {
-                const process = (group) => new Promise((resolve) => {
-                    const groupLength = group.numSectors * chain.sectorSize;
-                    const groupBuffer = data.slice(groupOffset, groupOffset += groupLength);
-                    chain._vol_writeSectors(group.firstSector, groupBuffer, function(e) {
-                        if (e && groupsPending !== -1) groupsPending = -1, cb(e);
-                        else if (--groupsPending === 0) cb();
-                        resolve();
-                    });
-                });
-
-                (async () => {
-                    for (const group of groups) {
-                        await process(group);
-                    }
-                })().catch((e) => cb(e));
-            } else cb(); // 0-length data case
-        });
-    };
-
-    chain.truncate = function(numSectors, cb) {
-        extendCacheToInclude(Infinity, function(e, c) {
-            if (e) return cb(e);
-
-            const currentLength = cache.length-1;
-            const clustersNeeded = Math.ceil(numSectors / vol._sectorsPerCluster);
-            if (clustersNeeded < currentLength) shrinkChainToLength(clustersNeeded, cb);
-            else if (clustersNeeded > currentLength) expandChainToLength(clustersNeeded, cb);
-            else cb();
-        });
-    };
-
-
-    chain.toJSON = function() {
-        return { firstCluster: firstCluster };
-    };
-
-    return chain;
-};
-
-exports.sectorChain = function(vol, firstSector, numSectors) {
-    const chain = _baseChain(vol);
-
-    chain.firstSector = firstSector;
-    chain.numSectors = numSectors;
-
-    chain.readSectors = function(i, dest, cb) {
-        if (i < numSectors) chain._vol_readSectors(firstSector+i, dest, cb);
-        else _pastEOF(cb);
-    };
-
-    chain.writeSectors = function(i, data, cb) {
-        if (i < numSectors) chain._vol_writeSectors(firstSector+i, data, cb);
-        else _.delayedCall(cb, S.err.NOSPC());
-    };
-
-    chain.truncate = function(i, cb) {
-        _.delayedCall(cb, S.err.INVAL());
-    };
-
-    chain.toJSON = function() {
-        return { firstSector: firstSector, numSectors: numSectors };
-    };
-
-    return chain;
-};
-
-// NOTE: used with mixed feelings, broken out to mark uses
-function _pastEOF(cb) {
-    _.delayedCall(cb, null, null);
-}