knight/deploy-to-neocities
1
0
Fork 0
mirror of https://github.com/bcomnes/deploy-to-neocities.git synced 2026-01-16 22:56:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

3.0.2

Browse Source
This commit is contained in:
bcomnes 2024-12-09 18:00:43 +00:00
parent 68d0158045
commit 60adbf96af
5 changed files with 117 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -7,7 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
## [v3.0.1](https://github.com/bcomnes/deploy-to-neocities/compare/v3.0.0...v3.0.1)
## [v3.0.2](https://github.com/bcomnes/deploy-to-neocities/compare/v3.0.1...v3.0.2)
### Merged
- chore(deps): bump async-neocities from 4.0.4 to 4.1.0 [`#210`](https://github.com/bcomnes/deploy-to-neocities/pull/210)
## [v3.0.1](https://github.com/bcomnes/deploy-to-neocities/compare/v3.0.0...v3.0.1) - 2024-11-28
### Merged

189
dist/index.cjs vendored
View File

@ -27178,7 +27178,6 @@ var require_client_h2 = __commonJS({
} = require_symbols6();
var kOpenStreams = Symbol("open streams");
var extractBody;
var h2ExperimentalWarned = false;
var http2;
try {
http2 = require("node:http2");
@ -27211,12 +27210,6 @@ var require_client_h2 = __commonJS({
}
async function connectH2(client, socket) {
client[kSocket] = socket;
if (!h2ExperimentalWarned) {
h2ExperimentalWarned = true;
process.emitWarning("H2 support is experimental, expect them to change at any time.", {
code: "UNDICI-H2"
});
}
const session = http2.connect(client[kUrl], {
createConnection: () => socket,
peerMaxConcurrentStreams: client[kMaxConcurrentStreams],
@ -31411,53 +31404,52 @@ var require_decorator_handler = __commonJS({
"node_modules/async-neocities/node_modules/undici/lib/handler/decorator-handler.js"(exports2, module2) {
"use strict";
var assert2 = require("node:assert");
var WrapHandler = require_wrap_handler();
module2.exports = class DecoratorHandler {
#handler;
#onCompleteCalled = false;
#onErrorCalled = false;
#onResponseStartCalled = false;
constructor(handler) {
if (typeof handler !== "object" || handler === null) {
throw new TypeError("handler must be an object");
}
this.#handler = handler;
this.#handler = WrapHandler.wrap(handler);
}
onConnect(...args) {
return this.#handler.onConnect?.(...args);
onRequestStart(...args) {
this.#handler.onRequestStart?.(...args);
}
onError(...args) {
this.#onErrorCalled = true;
return this.#handler.onError?.(...args);
}
onUpgrade(...args) {
onRequestUpgrade(...args) {
assert2(!this.#onCompleteCalled);
assert2(!this.#onErrorCalled);
return this.#handler.onUpgrade?.(...args);
return this.#handler.onRequestUpgrade?.(...args);
}
onResponseStarted(...args) {
onResponseStart(...args) {
assert2(!this.#onCompleteCalled);
assert2(!this.#onErrorCalled);
return this.#handler.onResponseStarted?.(...args);
assert2(!this.#onResponseStartCalled);
this.#onResponseStartCalled = true;
return this.#handler.onResponseStart?.(...args);
}
onHeaders(...args) {
onResponseData(...args) {
assert2(!this.#onCompleteCalled);
assert2(!this.#onErrorCalled);
return this.#handler.onHeaders?.(...args);
return this.#handler.onResponseData?.(...args);
}
onData(...args) {
assert2(!this.#onCompleteCalled);
assert2(!this.#onErrorCalled);
return this.#handler.onData?.(...args);
}
onComplete(...args) {
onResponseEnd(...args) {
assert2(!this.#onCompleteCalled);
assert2(!this.#onErrorCalled);
this.#onCompleteCalled = true;
return this.#handler.onComplete?.(...args);
return this.#handler.onResponseEnd?.(...args);
}
onBodySent(...args) {
assert2(!this.#onCompleteCalled);
assert2(!this.#onErrorCalled);
return this.#handler.onBodySent?.(...args);
onResponseError(...args) {
this.#onErrorCalled = true;
return this.#handler.onResponseError?.(...args);
}
/**
* @deprecated
*/
onBodySent() {
}
};
}
@ -31643,49 +31635,46 @@ var require_redirect = __commonJS({
var require_response_error = __commonJS({
"node_modules/async-neocities/node_modules/undici/lib/interceptor/response-error.js"(exports2, module2) {
"use strict";
var { parseHeaders } = require_util8();
var DecoratorHandler = require_decorator_handler();
var { ResponseError } = require_errors2();
var ResponseErrorHandler = class extends DecoratorHandler {
#handler;
#statusCode;
#contentType;
#decoder;
#headers;
#body;
constructor(opts, { handler }) {
constructor(_opts, { handler }) {
super(handler);
this.#handler = handler;
}
onConnect(abort) {
#checkContentType(contentType) {
return this.#contentType.indexOf(contentType) === 0;
}
onRequestStart(controller, context) {
this.#statusCode = 0;
this.#contentType = null;
this.#decoder = null;
this.#headers = null;
this.#body = "";
return this.#handler.onConnect(abort);
return super.onRequestStart(controller, context);
}
#checkContentType(contentType) {
return this.#contentType.indexOf(contentType) === 0;
}
onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
onResponseStart(controller, statusCode, headers, statusMessage) {
this.#statusCode = statusCode;
this.#headers = headers;
this.#contentType = headers["content-type"];
if (this.#statusCode < 400) {
return this.#handler.onHeaders(statusCode, rawHeaders, resume, statusMessage, headers);
return super.onResponseStart(controller, statusCode, headers, statusMessage);
}
if (this.#checkContentType("application/json") || this.#checkContentType("text/plain")) {
this.#decoder = new TextDecoder("utf-8");
}
}
onData(chunk2) {
onResponseData(controller, chunk2) {
if (this.#statusCode < 400) {
return this.#handler.onData(chunk2);
return super.onResponseData(controller, chunk2);
}
this.#body += this.#decoder?.decode(chunk2, { stream: true }) ?? "";
}
onComplete(rawTrailers) {
onResponseEnd(controller, trailers) {
if (this.#statusCode >= 400) {
this.#body += this.#decoder?.decode(void 0, { stream: false }) ?? "";
if (this.#checkContentType("application/json")) {
@ -31705,13 +31694,13 @@ var require_response_error = __commonJS({
} finally {
Error.stackTraceLimit = stackTraceLimit;
}
this.#handler.onError(err);
super.onResponseError(controller, err);
} else {
this.#handler.onComplete(rawTrailers);
super.onResponseEnd(controller, trailers);
}
}
onError(err) {
this.#handler.onError(err);
onResponseError(err) {
super.onResponseError(err);
}
};
module2.exports = () => {
@ -31752,80 +31741,71 @@ var require_retry = __commonJS({
var require_dump = __commonJS({
"node_modules/async-neocities/node_modules/undici/lib/interceptor/dump.js"(exports2, module2) {
"use strict";
var util = require_util8();
var { InvalidArgumentError, RequestAbortedError } = require_errors2();
var DecoratorHandler = require_decorator_handler();
var DumpHandler = class extends DecoratorHandler {
#maxSize = 1024 * 1024;
#abort = null;
#dumped = false;
#aborted = false;
#size = 0;
#reason = null;
#handler = null;
constructor({ maxSize }, handler) {
#controller = null;
aborted = false;
reason = false;
constructor({ maxSize, signal }, handler) {
if (maxSize != null && (!Number.isFinite(maxSize) || maxSize < 1)) {
throw new InvalidArgumentError("maxSize must be a number greater than 0");
}
super(handler);
this.#maxSize = maxSize ?? this.#maxSize;
this.#handler = handler;
}
onConnect(abort) {
this.#abort = abort;
this.#handler.onConnect(this.#customAbort.bind(this));
#abort(reason) {
this.aborted = true;
this.reason = reason;
}
#customAbort(reason) {
this.#aborted = true;
this.#reason = reason;
onRequestStart(controller, context) {
controller.abort = this.#abort.bind(this);
this.#controller = controller;
return super.onRequestStart(controller, context);
}
// TODO: will require adjustment after new hooks are out
onHeaders(statusCode, rawHeaders, resume, statusMessage) {
const headers = util.parseHeaders(rawHeaders);
onResponseStart(controller, statusCode, headers, statusMessage) {
const contentLength = headers["content-length"];
if (contentLength != null && contentLength > this.#maxSize) {
throw new RequestAbortedError(
`Response size (${contentLength}) larger than maxSize (${this.#maxSize})`
);
}
if (this.#aborted) {
if (this.aborted === true) {
return true;
}
return this.#handler.onHeaders(
statusCode,
rawHeaders,
resume,
statusMessage
);
return super.onResponseStart(controller, statusCode, headers, statusMessage);
}
onError(err) {
onResponseError(controller, err) {
if (this.#dumped) {
return;
}
err = this.#reason ?? err;
this.#handler.onError(err);
err = this.#controller.reason ?? err;
super.onResponseError(controller, err);
}
onData(chunk2) {
onResponseData(controller, chunk2) {
this.#size = this.#size + chunk2.length;
if (this.#size >= this.#maxSize) {
this.#dumped = true;
if (this.#aborted) {
this.#handler.onError(this.#reason);
if (this.aborted === true) {
super.onResponseError(controller, this.reason);
} else {
this.#handler.onComplete([]);
super.onResponseEnd(controller, {});
}
}
return true;
}
onComplete(trailers) {
onResponseEnd(controller, trailers) {
if (this.#dumped) {
return;
}
if (this.#aborted) {
this.#handler.onError(this.reason);
if (this.#controller.aborted === true) {
super.onResponseError(controller, this.reason);
return;
}
this.#handler.onComplete(trailers);
super.onResponseEnd(controller, trailers);
}
};
function createDumpInterceptor({ maxSize: defaultMaxSize } = {
@ -31834,10 +31814,7 @@ var require_dump = __commonJS({
return (dispatch) => {
return function Intercept(opts, handler) {
const { dumpMaxSize = defaultMaxSize } = opts;
const dumpHandler = new DumpHandler(
{ maxSize: dumpMaxSize },
handler
);
const dumpHandler = new DumpHandler({ maxSize: dumpMaxSize, signal: opts.signal }, handler);
return dispatch(opts, dumpHandler);
};
};
@ -32025,24 +32002,24 @@ var require_dns = __commonJS({
#state = null;
#opts = null;
#dispatch = null;
#handler = null;
#origin = null;
#controller = null;
constructor(state, { origin, handler, dispatch }, opts) {
super(handler);
this.#origin = origin;
this.#handler = handler;
this.#opts = { ...opts };
this.#state = state;
this.#dispatch = dispatch;
}
onError(err) {
onResponseError(controller, err) {
switch (err.code) {
case "ETIMEDOUT":
case "ECONNREFUSED": {
if (this.#state.dualStack) {
this.#state.runLookup(this.#origin, this.#opts, (err2, newOrigin) => {
if (err2) {
return this.#handler.onError(err2);
super.onResponseError(controller, err2);
return;
}
const dispatchOpts = {
...this.#opts,
@ -32052,14 +32029,14 @@ var require_dns = __commonJS({
});
return;
}
this.#handler.onError(err);
return;
super.onResponseError(controller, err);
break;
}
case "ENOTFOUND":
this.#state.deleteRecord(this.#origin);
// eslint-disable-next-line no-fallthrough
default:
this.#handler.onError(err);
super.onResponseError(controller, err);
break;
}
}
@ -39935,9 +39912,6 @@ var require_undici2 = __commonJS({
const SqliteCacheStore = require_sqlite_cache_store();
module2.exports.cacheStores.SqliteCacheStore = SqliteCacheStore;
} catch (err) {
if (err.code !== "ERR_UNKNOWN_BUILTIN_MODULE") {
throw err;
}
}
module2.exports.buildConnector = buildConnector;
module2.exports.errors = errors;
@ -40043,7 +40017,7 @@ var require_package = __commonJS({
module2.exports = {
name: "async-neocities",
description: "A library and bin to deploy to neocities",
version: "4.0.4",
version: "4.1.0",
author: "Bret Comnes <bcomnes@gmail.com> (https://bret.io)",
type: "module",
bin: {
@ -50089,7 +50063,8 @@ async function previewDeployToNeocities({
directory,
apiKey,
includeUnsupportedFiles = false,
protectedFileFilter
protectedFileFilter,
uploadSort
}) {
const [localListing, neocitiesFiles] = await Promise.all([
import_async_folder_walker.default.allFiles(directory, {
@ -50106,6 +50081,9 @@ async function previewDeployToNeocities({
protectedFileFilter,
includeUnsupportedFiles
});
if (typeof uploadSort === "function") {
diff.filesToUpload.sort(uploadSort);
}
return diff;
}
async function deployToNeocities({
@ -50113,18 +50091,17 @@ async function deployToNeocities({
apiKey,
cleanup = false,
includeUnsupportedFiles = false,
protectedFileFilter
protectedFileFilter,
uploadSort
}) {
const diff = await previewDeployToNeocities({
directory,
apiKey,
includeUnsupportedFiles,
protectedFileFilter
protectedFileFilter,
uploadSort
});
const {
filesToUpload,
filesToDelete
} = diff;
const { filesToUpload, filesToDelete } = diff;
if (filesToUpload.length === 0 && (!cleanup || filesToDelete.length === 0)) {
return {
errors: [],
@ -50460,6 +50437,7 @@ var NeocitiesAPIClient = class {
* @param {boolean} [options.cleanup=false] Set cleanup to true to delete orphaned file.
* @param {boolean} [options.includeUnsupportedFiles=false] Set to true to bypass file type restrictions.
* @param {(path: string) => boolean} [options.protectedFileFilter] A filter function to filter out file you want to ignore.
* @param {Endpoints.Comparator<FileUpload>} [options.uploadSort] A sort function that lets you sort file upload order prior to uploading. FileUpload.name is probably what you want to sort by.
* @return {ReturnType<typeof Endpoints.deployToNeocities>} The fetched site info
*/
async deploy(options) {
@ -50475,6 +50453,7 @@ var NeocitiesAPIClient = class {
* @param {string} options.directory The path to the directory preview deploy.
* @param {boolean} [options.includeUnsupportedFiles=false] Set to true to bypass file type restrictions.
* @param {(path: string) => boolean} [options.protectedFileFilter] A filter function to filter out file you want to ignore.
* @param {Endpoints.Comparator<FileUpload>} [options.uploadSort] A sort function that lets you sort file upload order prior to uploading. FileUpload.name is probably what you want to sort by.
* @return {Promise<AsyncNeocitiesDiff>}
*/
async previewDeploy(options) {

4
dist/index.cjs.map vendored
View File

File diff suppressed because one or more lines are too long

51
dist/meta.json vendored
View File

@ -3535,7 +3535,7 @@
"format": "cjs"
},
"node_modules/async-neocities/node_modules/undici/lib/dispatcher/client-h2.js": {
"bytes": 20132,
"bytes": 19891,
"imports": [
{
"path": "node:assert",
@ -4382,12 +4382,17 @@
"format": "cjs"
},
"node_modules/async-neocities/node_modules/undici/lib/handler/decorator-handler.js": {
"bytes": 1458,
"bytes": 1444,
"imports": [
{
"path": "node:assert",
"kind": "require-call",
"external": true
},
{
"path": "node_modules/async-neocities/node_modules/undici/lib/handler/wrap-handler.js",
"kind": "require-call",
"original": "./wrap-handler"
}
],
"format": "cjs"
@ -4435,13 +4440,8 @@
"format": "cjs"
},
"node_modules/async-neocities/node_modules/undici/lib/interceptor/response-error.js": {
"bytes": 2347,
"bytes": 2371,
"imports": [
{
"path": "node_modules/async-neocities/node_modules/undici/lib/core/util.js",
"kind": "require-call",
"original": "../core/util"
},
{
"path": "node_modules/async-neocities/node_modules/undici/lib/handler/decorator-handler.js",
"kind": "require-call",
@ -4467,13 +4467,8 @@
"format": "cjs"
},
"node_modules/async-neocities/node_modules/undici/lib/interceptor/dump.js": {
"bytes": 2514,
"bytes": 2543,
"imports": [
{
"path": "node_modules/async-neocities/node_modules/undici/lib/core/util.js",
"kind": "require-call",
"original": "../core/util"
},
{
"path": "node_modules/async-neocities/node_modules/undici/lib/core/errors.js",
"kind": "require-call",
@ -4488,7 +4483,7 @@
"format": "cjs"
},
"node_modules/async-neocities/node_modules/undici/lib/interceptor/dns.js": {
"bytes": 9338,
"bytes": 9380,
"imports": [
{
"path": "node:net",
@ -5507,7 +5502,7 @@
"format": "cjs"
},
"node_modules/async-neocities/node_modules/undici/index.js": {
"bytes": 6440,
"bytes": 6623,
"imports": [
{
"path": "node_modules/async-neocities/node_modules/undici/lib/dispatcher/client.js",
@ -6081,7 +6076,7 @@
"format": "esm"
},
"node_modules/async-neocities/lib/api-endpoints.js": {
"bytes": 10433,
"bytes": 10932,
"imports": [
{
"path": "node_modules/async-folder-walker/index.js",
@ -6148,7 +6143,7 @@
"format": "esm"
},
"node_modules/async-neocities/index.js": {
"bytes": 3926,
"bytes": 4318,
"imports": [
{
"path": "node_modules/async-neocities/lib/api-endpoints.js",
@ -6313,7 +6308,7 @@
"imports": [],
"exports": [],
"inputs": {},
"bytes": 3264313
"bytes": 3264946
},
"dist/index.cjs": {
"imports": [
@ -8023,7 +8018,7 @@
"bytesInOutput": 39255
},
"node_modules/async-neocities/node_modules/undici/lib/dispatcher/client-h2.js": {
"bytesInOutput": 19035
"bytesInOutput": 18781
},
"node_modules/async-neocities/node_modules/undici/lib/dispatcher/client.js": {
"bytesInOutput": 17400
@ -8110,7 +8105,7 @@
"bytesInOutput": 931
},
"node_modules/async-neocities/node_modules/undici/lib/handler/decorator-handler.js": {
"bytesInOutput": 1815
"bytesInOutput": 1793
},
"node_modules/async-neocities/node_modules/undici/lib/handler/redirect-handler.js": {
"bytesInOutput": 6577
@ -8119,16 +8114,16 @@
"bytesInOutput": 891
},
"node_modules/async-neocities/node_modules/undici/lib/interceptor/response-error.js": {
"bytesInOutput": 2783
"bytesInOutput": 2750
},
"node_modules/async-neocities/node_modules/undici/lib/interceptor/retry.js": {
"bytesInOutput": 626
},
"node_modules/async-neocities/node_modules/undici/lib/interceptor/dump.js": {
"bytesInOutput": 2969
"bytesInOutput": 2934
},
"node_modules/async-neocities/node_modules/undici/lib/interceptor/dns.js": {
"bytesInOutput": 9923
"bytesInOutput": 9967
},
"node_modules/async-neocities/node_modules/undici/lib/util/cache.js": {
"bytesInOutput": 8751
@ -8227,7 +8222,7 @@
"bytesInOutput": 9996
},
"node_modules/async-neocities/node_modules/undici/index.js": {
"bytesInOutput": 6393
"bytesInOutput": 6311
},
"node_modules/async-neocities/package.json": {
"bytesInOutput": 2326
@ -8296,7 +8291,7 @@
"bytesInOutput": 2882
},
"node_modules/async-neocities/lib/api-endpoints.js": {
"bytesInOutput": 6523
"bytesInOutput": 6644
},
"node_modules/async-neocities/lib/always-ignore.js": {
"bytesInOutput": 130
@ -8317,7 +8312,7 @@
"bytesInOutput": 767
},
"node_modules/async-neocities/index.js": {
"bytesInOutput": 3390
"bytesInOutput": 3782
},
"node_modules/@lukeed/ms/dist/index.mjs": {
"bytesInOutput": 698
@ -8347,7 +8342,7 @@
"bytesInOutput": 165
}
},
"bytes": 1998745
"bytes": 1998876
}
}
}

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "deploy-to-neocities",
"description": "Github Action to deplpoy a folder to Neocities.org",
"version": "3.0.1",
"version": "3.0.2",
"author": "Bret Comnes <bcomnes@gmail.com> (https://bret.io/)",
"bugs": {
"url": "https://github.com/bcomnes/deploy-to-neocities/issues"