fediverse
/
activity-kit-core
mirror of https://github.com/michaelcpuckett/activity-kit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixup

This commit is contained in:
Michael Puckett 2023-07-22 13:11:51 -04:00
parent d8867ac09e
commit 4fd2f316f7
17 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/lib/queryById.d.ts vendored
View File

@ -1,4 +1,4 @@
/// <reference types="node" />
import { Core } from '.';
import { AP } from '@activity-kit/types';
import * as AP from '@activity-kit/types';
export declare function queryById(this: Core, id: URL): Promise<AP.Entity | null>;

28
packages/core/lib/queryById.js
View File

@ -1,7 +1,31 @@
"use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.queryById = void 0;
const types_1 = require("@activity-kit/types");
const AP = __importStar(require("@activity-kit/types"));
const type_utilities_1 = require("@activity-kit/type-utilities");
const utilities_1 = require("@activity-kit/utilities");
async function queryById(id) {
if ((0, utilities_1.isLocal)(id)) {
@ -9,7 +33,7 @@ async function queryById(id) {
}
const fetchedEntity = await this.fetchEntityById(id);
if (!fetchedEntity ||
(0, types_1.isType)(fetchedEntity, types_1.AP.ExtendedObjectTypes.TOMBSTONE)) {
(0, type_utilities_1.isType)(fetchedEntity, AP.ExtendedObjectTypes.TOMBSTONE)) {
return this.findEntityById(id);
}
return fetchedEntity;

2
packages/core/lib/queryById.js.map
View File

@ -1 +1 @@
{"version":3,"file":"queryById.js","sourceRoot":"","sources":["../src/queryById.ts"],"names":[],"mappings":";;;AACA,+CAAiD;AACjD,uDAAkD;AAE3C,KAAK,UAAU,SAAS,CAE7B,EAAO;IAEP,IAAI,IAAA,mBAAO,EAAC,EAAE,CAAC,EAAE;QACf,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;KACtC;IAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAErD,IACE,CAAC,aAAa;QACd,IAAA,cAAM,EAAe,aAAa,EAAE,UAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,EACrE;QACA,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;KAChC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAlBD,8BAkBC"}
{"version":3,"file":"queryById.js","sourceRoot":"","sources":["../src/queryById.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAA0C;AAC1C,iEAAsD;AACtD,uDAAkD;AAE3C,KAAK,UAAU,SAAS,CAE7B,EAAO;IAEP,IAAI,IAAA,mBAAO,EAAC,EAAE,CAAC,EAAE;QACf,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;KACtC;IAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAErD,IACE,CAAC,aAAa;QACd,IAAA,uBAAM,EAAe,aAAa,EAAE,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,EACrE;QACA,OAAO,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;KAChC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAlBD,8BAkBC"}

3
packages/core/src/queryById.ts
View File

@ -1,5 +1,6 @@
import { Core } from '.';
import { AP, isType } from '@activity-kit/types';
import * as AP from '@activity-kit/types';
import { isType } from '@activity-kit/type-utilities';
import { isLocal } from '@activity-kit/utilities';
export async function queryById(

2
packages/crypto-node/lib/index.d.ts vendored
View File

@ -1,4 +1,4 @@
import { CryptoAdapter } from '@activity-kit/types';
import { CryptoAdapter } from '@activity-kit/core';
import { generateKeyPair } from './generateKeyPair';
import { randomBytes } from './randomBytes';
import { hashPassword } from './hashPassword';

2
packages/crypto-node/package.json
View File

@ -25,7 +25,7 @@
"lint": "eslint src/**/*.ts"
},
"dependencies": {
"@activity-kit/types": "^0.4.45"
"@activity-kit/core": "^0.4.51"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^5.40.0",

2
packages/crypto-node/src/index.ts
View File

@ -1,4 +1,4 @@
import { CryptoAdapter } from '@activity-kit/types';
import { CryptoAdapter } from '@activity-kit/core';
import { generateKeyPair } from './generateKeyPair';
import { randomBytes } from './randomBytes';
import { hashPassword } from './hashPassword';

3
packages/db-mongo/lib/findOne.d.ts vendored
View File

@ -1,3 +1,4 @@
import { MongoDbAdapter } from '.';
import { AP, DbOptions } from '@activity-kit/types';
import * as AP from '@activity-kit/types';
import { DbOptions } from '@activity-kit/core';
export declare function findOne(this: MongoDbAdapter, collection: string, matchingObject: Record<string, unknown>, options?: Array<keyof typeof DbOptions>): Promise<AP.Entity | null>;

4
packages/db-mongo/lib/findOne.js
View File

@ -1,7 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.findOne = void 0;
const types_1 = require("@activity-kit/types");
const core_1 = require("@activity-kit/core");
const utilities_1 = require("@activity-kit/utilities");
const mongodb_1 = require("mongodb");
async function findOne(collection, matchingObject, options) {
@ -9,7 +9,7 @@ async function findOne(collection, matchingObject, options) {
throw new Error('Bad database.');
}
let value = null;
if (options && options.includes(types_1.DbOptions.CASE_INSENSITIVE)) {
if (options && options.includes(core_1.DbOptions.CASE_INSENSITIVE)) {
const cursor = this.db
.collection(collection)
.find(matchingObject)

2
packages/db-mongo/lib/findOne.js.map
View File

@ -1 +1 @@
{"version":3,"file":"findOne.js","sourceRoot":"","sources":["../src/findOne.ts"],"names":[],"mappings":";;;AACA,+CAAoD;AACpD,uDAA8D;AAC9D,qCAA6B;AAEtB,KAAK,UAAU,OAAO,CAE3B,UAAkB,EAClB,cAAuC,EACvC,OAAuC;IAEvC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,YAAY,YAAE,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IAED,IAAI,KAAK,GAA4B,IAAI,CAAC;IAE1C,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,iBAAS,CAAC,gBAAgB,CAAC,EAAE;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE;aACnB,UAAU,CAAC,UAAU,CAAC;aACtB,IAAI,CAAC,cAAc,CAAC;aACpB,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;SACpB;KACF;IAED,IAAI,CAAC,KAAK,EAAE;QACV,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;KACtE;IAED,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC,GAAG,CAAC;IAEjB,OAAO,IAAA,+BAAmB,EAAC,KAAK,CAAC,CAAC;AACpC,CAAC;AAnCD,0BAmCC"}
{"version":3,"file":"findOne.js","sourceRoot":"","sources":["../src/findOne.ts"],"names":[],"mappings":";;;AAEA,6CAA+C;AAC/C,uDAA8D;AAC9D,qCAA6B;AAEtB,KAAK,UAAU,OAAO,CAE3B,UAAkB,EAClB,cAAuC,EACvC,OAAuC;IAEvC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,YAAY,YAAE,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IAED,IAAI,KAAK,GAA4B,IAAI,CAAC;IAE1C,IAAI,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,gBAAS,CAAC,gBAAgB,CAAC,EAAE;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE;aACnB,UAAU,CAAC,UAAU,CAAC;aACtB,IAAI,CAAC,cAAc,CAAC;aACpB,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;SACpB;KACF;IAED,IAAI,CAAC,KAAK,EAAE;QACV,KAAK,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;KACtE;IAED,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC,GAAG,CAAC;IAEjB,OAAO,IAAA,+BAAmB,EAAC,KAAK,CAAC,CAAC;AACpC,CAAC;AAnCD,0BAmCC"}

2
packages/db-mongo/lib/index.d.ts vendored
View File

@ -1,5 +1,5 @@
import { Db } from 'mongodb';
import { DbAdapter } from '@activity-kit/types';
import { DbAdapter } from '@activity-kit/core';
import { findOne } from './findOne';
import { findAll } from './findAll';
import { findStringValueById } from './findStringValueById';

2
packages/storage-ftp/lib/index.d.ts vendored
View File

@ -1,4 +1,4 @@
import type { StorageAdapter } from '@activity-kit/types';
import { StorageAdapter } from '@activity-kit/core';
import { upload } from './upload';
import { default as FtpClient } from 'ftp';
export declare class FtpStorageAdapter implements StorageAdapter {

10
packages/storage-ftp/lib/upload.js
View File

@ -5,15 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
exports.upload = void 0;
const ftp_1 = __importDefault(require("ftp"));
const types_1 = require("@activity-kit/types");
const type_utilities_1 = require("@activity-kit/type-utilities");
async function upload(file) {
return await new Promise((resolve, reject) => {
const client = new ftp_1.default();
const { host, path = '/', user, password } = this.params;
(0, types_1.assertIsString)(host);
(0, types_1.assertIsString)(user);
(0, types_1.assertIsString)(password);
(0, types_1.assertIsString)(path);
(0, type_utilities_1.assertIsString)(host);
(0, type_utilities_1.assertIsString)(user);
(0, type_utilities_1.assertIsString)(password);
(0, type_utilities_1.assertIsString)(path);
client.on('ready', () => {
client.put(file.filepath, file.newFilename, (error) => {
client.end();

2
packages/storage-ftp/lib/upload.js.map
View File

@ -1 +1 @@
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../src/upload.ts"],"names":[],"mappings":";;;;;;AACA,8CAA2C;AAE3C,+CAAqD;AAE9C,KAAK,UAAU,MAAM,CAA0B,IAAU;IAC9D,OAAO,MAAM,IAAI,OAAO,CAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAChD,MAAM,MAAM,GAAG,IAAI,aAAS,EAAE,CAAC;QAC/B,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAEzD,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC;QACrB,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC;QACrB,IAAA,sBAAc,EAAC,QAAQ,CAAC,CAAC;QACzB,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC;QAErB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;gBACpD,MAAM,CAAC,GAAG,EAAE,CAAC;gBAEb,IAAI,KAAK,EAAE;oBACT,MAAM,CAAC,KAAK,CAAC,CAAC;iBACf;qBAAM;oBACL,OAAO,CAAC,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;iBAChE;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC;YACb,IAAI;YACJ,IAAI;YACJ,QAAQ;SACT,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA5BD,wBA4BC"}
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../src/upload.ts"],"names":[],"mappings":";;;;;;AACA,8CAA2C;AAE3C,iEAA8D;AAEvD,KAAK,UAAU,MAAM,CAA0B,IAAU;IAC9D,OAAO,MAAM,IAAI,OAAO,CAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAChD,MAAM,MAAM,GAAG,IAAI,aAAS,EAAE,CAAC;QAC/B,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAEzD,IAAA,+BAAc,EAAC,IAAI,CAAC,CAAC;QACrB,IAAA,+BAAc,EAAC,IAAI,CAAC,CAAC;QACrB,IAAA,+BAAc,EAAC,QAAQ,CAAC,CAAC;QACzB,IAAA,+BAAc,EAAC,IAAI,CAAC,CAAC;QAErB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;gBACpD,MAAM,CAAC,GAAG,EAAE,CAAC;gBAEb,IAAI,KAAK,EAAE;oBACT,MAAM,CAAC,KAAK,CAAC,CAAC;iBACf;qBAAM;oBACL,OAAO,CAAC,IAAI,GAAG,CAAC,WAAW,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;iBAChE;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,OAAO,CAAC;YACb,IAAI;YACJ,IAAI;YACJ,QAAQ;SACT,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA5BD,wBA4BC"}

3
packages/storage-ftp/package.json
View File

@ -28,7 +28,8 @@
"url": "https://github.com/michaelcpuckett/activitypub-core/issues"
},
"dependencies": {
"@activity-kit/types": "^0.4.45",
"@activity-kit/type-utilities": "0.4.45",
"@activity-kit/core": "^0.4.51",
"ftp": "^0.3.10"
},
"devDependencies": {

2
packages/storage-ftp/src/index.ts
View File

@ -1,4 +1,4 @@
import type { StorageAdapter } from '@activity-kit/types';
import { StorageAdapter } from '@activity-kit/core';
import { upload } from './upload';
import { default as FtpClient } from 'ftp';

2
packages/storage-ftp/src/upload.ts
View File

@ -1,7 +1,7 @@
import type { File } from 'formidable';
import { default as FtpClient } from 'ftp';
import { FtpStorageAdapter } from '.';
import { assertIsString } from '@activity-kit/types';
import { assertIsString } from '@activity-kit/type-utilities';
export async function upload(this: FtpStorageAdapter, file: File) {
return await new Promise<URL>((resolve, reject) => {