Skip to content

Commit

Permalink
feat: fs-lite driver (#284)
Browse files Browse the repository at this point in the history
  • Loading branch information
pi0 authored Aug 7, 2023
1 parent 0268049 commit 820a626
Show file tree
Hide file tree
Showing 6 changed files with 145 additions and 2 deletions.
18 changes: 18 additions & 0 deletions docs/content/6.drivers/fs.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,21 @@ const storage = createStorage({
- `base`: Base directory to isolate operations on this directory
- `ignore`: Ignore patterns for watch <!-- and key listing -->
- `watchOptions`: Additional [chokidar](https://github.com/paulmillr/chokidar) options.

## Node.js Filesystem (Lite)

This driver uses pure Node.js API without extra dependencies.

```js
import { createStorage } from "unstorage";
import fsLiteDriver from "unstorage/drivers/fs-lite";

const storage = createStorage({
driver: fsLiteDriver({ base: "./tmp" }),
});
```

**Options:**

- `base`: Base directory to isolate operations on this directory
- `ignore`: Optional callback function `(path: stirng) => boolean`
87 changes: 87 additions & 0 deletions src/drivers/fs-lite.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
import { existsSync, promises as fsp, Stats } from "fs";
import { resolve, join } from "path";
import { createError, createRequiredError, defineDriver } from "./utils";
import {
readFile,
writeFile,
readdirRecursive,
rmRecursive,
unlink,
} from "./utils/node-fs";
import anymatch from "anymatch";

export interface FSStorageOptions {
base?: string;
ignore?: (path: string) => boolean;
readOnly?: boolean;
noClear?: boolean;
}

const PATH_TRAVERSE_RE = /\.\.\:|\.\.$/;

const DRIVER_NAME = "fs-lite";

export default defineDriver((opts: FSStorageOptions = {}) => {
if (!opts.base) {
throw createRequiredError(DRIVER_NAME, "base");
}

opts.base = resolve(opts.base);
const r = (key: string) => {
if (PATH_TRAVERSE_RE.test(key)) {
throw createError(
DRIVER_NAME,
`Invalid key: ${JSON.stringify(key)}. It should not contain .. segments`
);
}
const resolved = join(opts.base!, key.replace(/:/g, "/"));
return resolved;
};

return {
name: DRIVER_NAME,
options: opts,
hasItem(key) {
return existsSync(r(key));
},
getItem(key) {
return readFile(r(key), "utf8");
},
getItemRaw(key) {
return readFile(r(key));
},
async getMeta(key) {
const { atime, mtime, size, birthtime, ctime } = await fsp
.stat(r(key))
.catch(() => ({}) as Stats);
return { atime, mtime, size, birthtime, ctime };
},
setItem(key, value) {
if (opts.readOnly) {
return;
}
return writeFile(r(key), value, "utf8");
},
setItemRaw(key, value) {
if (opts.readOnly) {
return;
}
return writeFile(r(key), value);
},
removeItem(key) {
if (opts.readOnly) {
return;
}
return unlink(r(key));
},
getKeys() {
return readdirRecursive(r("."), opts.ignore);
},
async clear() {
if (opts.readOnly || opts.noClear) {
return;
}
await rmRecursive(r("."));
},
};
});
2 changes: 1 addition & 1 deletion src/drivers/utils/node-fs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export async function readdirRecursive(
const dirFiles = await readdirRecursive(entryPath, ignore);
files.push(...dirFiles.map((f) => entry.name + "/" + f));
} else {
if (ignore && !ignore(entry.name)) {
if (!(ignore && ignore(entry.name))) {
files.push(entry.name);
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const builtinDrivers = {
cloudflareKVHTTP: "unstorage/drivers/cloudflare-kv-http",
cloudflareR2Binding: "unstorage/drivers/cloudflare-r2-binding",
fs: "unstorage/drivers/fs",
fsLite: "unstorage/drivers/fs-lite",
github: "unstorage/drivers/github",
http: "unstorage/drivers/http",
indexedb: "unstorage/drivers/indexedb",
Expand Down Expand Up @@ -60,6 +61,7 @@ export type BuiltinDriverOptions = {
(typeof import("./drivers/cloudflare-r2-binding"))["default"]
>;
fs: ExtractOpts<(typeof import("./drivers/fs"))["default"]>;
fsLite: ExtractOpts<(typeof import("./drivers/fs-lite"))["default"]>;
github: ExtractOpts<(typeof import("./drivers/github"))["default"]>;
http: ExtractOpts<(typeof import("./drivers/http"))["default"]>;
indexedb: ExtractOpts<(typeof import("./drivers/indexedb"))["default"]>;
Expand Down
36 changes: 36 additions & 0 deletions test/drivers/fs-lite.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { describe, it, expect } from "vitest";
import { resolve } from "path";
import { readFile } from "../../src/drivers/utils/node-fs";
import { testDriver } from "./utils";
import driver from "../../src/drivers/fs-lite";

describe("drivers: fs-lite", () => {
const dir = resolve(__dirname, "tmp/fs-lite");

testDriver({
driver: driver({ base: dir }),
additionalTests(ctx) {
it("check filesystem", async () => {
expect(await readFile(resolve(dir, "s1/a"), "utf8")).toBe("test_data");
});
it("native meta", async () => {
const meta = await ctx.storage.getMeta("/s1/a");
expect(meta.atime?.constructor.name).toBe("Date");
expect(meta.mtime?.constructor.name).toBe("Date");
expect(meta.size).toBeGreaterThan(0);
});

const invalidKeys = ["../foobar", "..:foobar", "../", "..:", ".."];
for (const key of invalidKeys) {
it("disallow path travesal: ", async () => {
await expect(ctx.storage.getItem(key)).rejects.toThrow("Invalid key");
});
}

it("allow double dots in filename: ", async () => {
await ctx.storage.setItem("s1/te..st..js", "ok");
expect(await ctx.storage.getItem("s1/te..st..js")).toBe("ok");
});
},
});
});
2 changes: 1 addition & 1 deletion test/drivers/fs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { testDriver } from "./utils";
import driver from "../../src/drivers/fs";

describe("drivers: fs", () => {
const dir = resolve(__dirname, "tmp");
const dir = resolve(__dirname, "tmp/fs");

testDriver({
driver: driver({ base: dir }),
Expand Down

0 comments on commit 820a626

Please sign in to comment.